From 0eee1973713f664c5fac3cbfc43ef32186b73269 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 3 Apr 2009 16:16:48 -0700 Subject: [PATCH] Revert recent fixes to move them to omap-fixes branch These will get merged back from omap-fixes. Signed-off-by: Tony Lindgren --- arch/arm/kernel/head.S | 2 +- drivers/i2c/busses/i2c-omap.c | 10 ++++------ drivers/mmc/host/omap.c | 2 ++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index 1bc918cbdb1..21e17dc94cb 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -282,7 +282,7 @@ __create_page_tables: .endif str r6, [r0] -#if defined(CONFIG_DEBUG_LL) || defined(CONFIG_DEBUG_SPINLOCK) +#ifdef CONFIG_DEBUG_LL ldr r7, [r10, #PROCINFO_IO_MMUFLAGS] @ io_mmuflags /* * Map in IO space for serial debugging. diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index 9919c086ff5..ece0125a1ee 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -672,9 +672,8 @@ omap_i2c_isr(int this_irq, void *dev_id) if (stat & OMAP_I2C_STAT_RRDY) num_bytes = dev->fifo_size; else - num_bytes = (omap_i2c_read_reg(dev, - OMAP_I2C_BUFSTAT_REG) - >> 8) & 0x3F; + num_bytes = omap_i2c_read_reg(dev, + OMAP_I2C_BUFSTAT_REG); } while (num_bytes) { num_bytes--; @@ -712,9 +711,8 @@ omap_i2c_isr(int this_irq, void *dev_id) if (stat & OMAP_I2C_STAT_XRDY) num_bytes = dev->fifo_size; else - num_bytes = (omap_i2c_read_reg(dev, - OMAP_I2C_BUFSTAT_REG)) - & 0x3F; + num_bytes = omap_i2c_read_reg(dev, + OMAP_I2C_BUFSTAT_REG); } while (num_bytes) { num_bytes--; diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index bfa25c01c87..5570849188c 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -157,6 +157,8 @@ struct mmc_omap_host { struct timer_list dma_timer; unsigned dma_len; + short power_pin; + struct mmc_omap_slot *slots[OMAP_MMC_MAX_SLOTS]; struct mmc_omap_slot *current_slot; spinlock_t slot_lock; -- 2.41.0