Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48feb337 authored by Felipe Balbi's avatar Felipe Balbi Committed by Linus Torvalds
Browse files

arm: omap: switch over to gpio_set_debounce 



Stop using the omap-specific implementations for gpio debouncing now that
gpiolib provides its own support.

Signed-off-by: default avatarFelipe Balbi <felipe.balbi@nokia.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 168ef3d9

arch/arm/mach-omap2/board-3430sdp.c

+1 −3
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-omap2/board-ldp.c

+1 −2
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-omap2/board-omap3evm.c

+1 −3
Original line number Diff line number Diff line
@@ -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)

arch/arm/mach-omap2/board-omap3pandora.c

+2 −2
Original line number Diff line number Diff line
@@ -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[] = {

arch/arm/mach-omap2/board-omap3touchbook.c

+1 −2
Original line number Diff line number Diff line
@@ -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 = {