8 files changed, 58 insertions, 70 deletions

diff --git a/arch/arm/include/asm/scatterlist.h b/arch/arm/include/asm/scatterlist.h
index bcda59f39941..2f87870d9347 100644
--- a/arch/arm/include/asm/scatterlist.h
+++ b/arch/arm/include/asm/scatterlist.h
@@ -3,9 +3,6 @@
 
 #include <asm/memory.h>
 #include <asm/types.h>
-
 #include <asm-generic/scatterlist.h>
 
-#undef ARCH_HAS_SG_CHAIN
-
 #endif /* _ASMARM_SCATTERLIST_H */
diff --git a/arch/arm/mach-davinci/include/mach/mmc.h b/arch/arm/mach-davinci/include/mach/mmc.h
index 5a85e24f3673..d4f1e9675069 100644
--- a/arch/arm/mach-davinci/include/mach/mmc.h
+++ b/arch/arm/mach-davinci/include/mach/mmc.h
@@ -22,6 +22,9 @@ struct davinci_mmc_config {
 
         /* Version of the MMC/SD controller */
         u8      version;
+
+        /* Number of sg segments */
+        u8      nr_sg;
 };
 void davinci_setup_mmc(int module, struct davinci_mmc_config *config);
 
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index e7d629b3c76a..f474a80b8867 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -137,9 +137,7 @@ static void ads7846_dev_init(void)
         }
 
         gpio_direction_input(ts_gpio);
-
-        omap_set_gpio_debounce(ts_gpio, 1);
-        omap_set_gpio_debounce_time(ts_gpio, 0xa);
+        gpio_set_debounce(ts_gpio, 310);
 }
 
 static int ads7846_get_pendown_state(void)
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index 5fcb52e71298..fefd7e6e9779 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -209,8 +209,7 @@ static void ads7846_dev_init(void)
         }
 
         gpio_direction_input(ts_gpio);
-        omap_set_gpio_debounce(ts_gpio, 1);
-        omap_set_gpio_debounce_time(ts_gpio, 0xa);
+        gpio_set_debounce(ts_gpio, 310);
 }
 
 static int ads7846_get_pendown_state(void)
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 81bba194b030..b95261013812 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -579,9 +579,7 @@ static void ads7846_dev_init(void)
                 printk(KERN_ERR "can't get ads7846 pen down GPIO\n");
 
         gpio_direction_input(OMAP3_EVM_TS_GPIO);
-
-        omap_set_gpio_debounce(OMAP3_EVM_TS_GPIO, 1);
-        omap_set_gpio_debounce_time(OMAP3_EVM_TS_GPIO, 0xa);
+        gpio_set_debounce(OMAP3_EVM_TS_GPIO, 310);
 }
 
 static int ads7846_get_pendown_state(void)
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index 395d049bf010..db06dc910ba7 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -130,8 +130,8 @@ static struct platform_device pandora_keys_gpio = {
 static void __init pandora_keys_gpio_init(void)
 {
         /* set debounce time for GPIO banks 4 and 6 */
-        omap_set_gpio_debounce_time(32 * 3, GPIO_DEBOUNCE_TIME);
-        omap_set_gpio_debounce_time(32 * 5, GPIO_DEBOUNCE_TIME);
+        gpio_set_debounce(32 * 3, GPIO_DEBOUNCE_TIME);
+        gpio_set_debounce(32 * 5, GPIO_DEBOUNCE_TIME);
 }
 
 static int board_keymap[] = {
diff --git a/arch/arm/mach-omap2/board-omap3touchbook.c b/arch/arm/mach-omap2/board-omap3touchbook.c
index 2504d41f923e..2f5f8233dd5b 100644
--- a/arch/arm/mach-omap2/board-omap3touchbook.c
+++ b/arch/arm/mach-omap2/board-omap3touchbook.c
@@ -328,8 +328,7 @@ static void __init omap3_ads7846_init(void)
         }
 
         gpio_direction_input(OMAP3_TS_GPIO);
-        omap_set_gpio_debounce(OMAP3_TS_GPIO, 1);
-        omap_set_gpio_debounce_time(OMAP3_TS_GPIO, 0xa);
+        gpio_set_debounce(OMAP3_TS_GPIO, 310);
 }
 
 static struct ads7846_platform_data ads7846_config = {
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index dc2ac42d6319..393e9219a5b6 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -624,79 +624,58 @@ do {	\
         __raw_writel(l, base + reg); \
 } while(0)
 
-void omap_set_gpio_debounce(int gpio, int enable)
+/**
+ * _set_gpio_debounce - low level gpio debounce time
+ * @bank: the gpio bank we're acting upon
+ * @gpio: the gpio number on this @gpio
+ * @debounce: debounce time to use
+ *
+ * OMAP's debounce time is in 31us steps so we need
+ * to convert and round up to the closest unit.
+ */
+static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
+                unsigned debounce)
 {
-        struct gpio_bank *bank;
-        void __iomem *reg;
-        unsigned long flags;
-        u32 val, l = 1 << get_gpio_index(gpio);
+        void __iomem            *reg = bank->base;
+        u32                     val;
+        u32                     l;
+
+        if (debounce < 32)
+                debounce = 0x01;
+        else if (debounce > 7936)
+                debounce = 0xff;
+        else
+                debounce = (debounce / 0x1f) - 1;
 
-        if (cpu_class_is_omap1())
-                return;
+        l = 1 << get_gpio_index(gpio);
 
-        bank = get_gpio_bank(gpio);
-        reg = bank->base;
+        if (cpu_is_omap44xx())
+                reg += OMAP4_GPIO_DEBOUNCINGTIME;
+        else
+                reg += OMAP24XX_GPIO_DEBOUNCE_VAL;
+
+        __raw_writel(debounce, reg);
 
+        reg = bank->base;
         if (cpu_is_omap44xx())
                 reg += OMAP4_GPIO_DEBOUNCENABLE;
         else
                 reg += OMAP24XX_GPIO_DEBOUNCE_EN;
 
-        if (!(bank->mod_usage & l)) {
-                printk(KERN_ERR "GPIO %d not requested\n", gpio);
-                return;
-        }
-
-        spin_lock_irqsave(&bank->lock, flags);
         val = __raw_readl(reg);
 
-        if (enable && !(val & l))
+        if (debounce) {
                 val |= l;
-        else if (!enable && (val & l))
-                val &= ~l;
-        else
-                goto done;
-
-        if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
-                bank->dbck_enable_mask = val;
-                if (enable)
+                if (cpu_is_omap34xx() || cpu_is_omap44xx())
                         clk_enable(bank->dbck);
-                else
+        } else {
+                val &= ~l;
+                if (cpu_is_omap34xx() || cpu_is_omap44xx())
                         clk_disable(bank->dbck);
         }
 
         __raw_writel(val, reg);
-done:
-        spin_unlock_irqrestore(&bank->lock, flags);
 }
-EXPORT_SYMBOL(omap_set_gpio_debounce);
-
-void omap_set_gpio_debounce_time(int gpio, int enc_time)
-{
-        struct gpio_bank *bank;
-        void __iomem *reg;
-
-        if (cpu_class_is_omap1())
-                return;
-
-        bank = get_gpio_bank(gpio);
-        reg = bank->base;
-
-        if (!bank->mod_usage) {
-                printk(KERN_ERR "GPIO not requested\n");
-                return;
-        }
-
-        enc_time &= 0xff;
-
-        if (cpu_is_omap44xx())
-                reg += OMAP4_GPIO_DEBOUNCINGTIME;
-        else
-                reg += OMAP24XX_GPIO_DEBOUNCE_VAL;
-
-        __raw_writel(enc_time, reg);
-}
-EXPORT_SYMBOL(omap_set_gpio_debounce_time);
 
 #ifdef CONFIG_ARCH_OMAP2PLUS
 static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
@@ -1656,6 +1635,20 @@ static int gpio_output(struct gpio_chip *chip, unsigned offset, int value)
         return 0;
 }
 
+static int gpio_debounce(struct gpio_chip *chip, unsigned offset,
+                unsigned debounce)
+{
+        struct gpio_bank *bank;
+        unsigned long flags;
+
+        bank = container_of(chip, struct gpio_bank, chip);
+        spin_lock_irqsave(&bank->lock, flags);
+        _set_gpio_debounce(bank, offset, debounce);
+        spin_unlock_irqrestore(&bank->lock, flags);
+
+        return 0;
+}
+
 static void gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
         struct gpio_bank *bank;
@@ -1909,6 +1902,7 @@ static int __init _omap_gpio_init(void)
                 bank->chip.direction_input = gpio_input;
                 bank->chip.get = gpio_get;
                 bank->chip.direction_output = gpio_output;
+                bank->chip.set_debounce = gpio_debounce;
                 bank->chip.set = gpio_set;
                 bank->chip.to_irq = gpio_2irq;
                 if (bank_is_mpuio(bank)) {