5 files changed, 6 insertions, 12 deletions

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 = {