diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-08-07 03:57:03 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-08-07 03:57:03 -0700 |
| commit | 8aeff82fabe818bbd755c74ce829ea5a4d89b5c0 (patch) | |
| tree | 8a4325a6c632cafbcb38c537ba8cfe86443271f8 | |
| parent | ae377aaf98630de03e58fffdf3f35dec3d0ca5e0 (diff) | |
| parent | c31cc1b764b6efb713601d351c1a879c042eab34 (diff) | |
| download | linux-3.10-8aeff82fabe818bbd755c74ce829ea5a4d89b5c0.tar.gz linux-3.10-8aeff82fabe818bbd755c74ce829ea5a4d89b5c0.tar.bz2 linux-3.10-8aeff82fabe818bbd755c74ce829ea5a4d89b5c0.zip | |
Merge branch 'for_3.6/fixes/ads7846-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into fixes
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/common-board-devices.c | 11 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/common-board-devices.h | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index ef230a0eb5e..0d362e9f9cb 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c @@ -58,6 +58,7 @@ #include "hsmmc.h" #include "common-board-devices.h" +#define OMAP3_EVM_TS_GPIO 175 #define OMAP3_EVM_EHCI_VBUS 22 #define OMAP3_EVM_EHCI_SELECT 61 diff --git a/arch/arm/mach-omap2/common-board-devices.c b/arch/arm/mach-omap2/common-board-devices.c index 14734746457..c1875862679 100644 --- a/arch/arm/mach-omap2/common-board-devices.c +++ b/arch/arm/mach-omap2/common-board-devices.c @@ -35,16 +35,6 @@ static struct omap2_mcspi_device_config ads7846_mcspi_config = { .turbo_mode = 0, }; -/* - * ADS7846 driver maybe request a gpio according to the value - * of pdata->get_pendown_state, but we have done this. So set - * get_pendown_state to avoid twice gpio requesting. - */ -static int omap3_get_pendown_state(void) -{ - return !gpio_get_value(OMAP3_EVM_TS_GPIO); -} - static struct ads7846_platform_data ads7846_config = { .x_max = 0x0fff, .y_max = 0x0fff, @@ -55,7 +45,6 @@ static struct ads7846_platform_data ads7846_config = { .debounce_rep = 1, .gpio_pendown = -EINVAL, .keep_vref_on = 1, - .get_pendown_state = &omap3_get_pendown_state, }; static struct spi_board_info ads7846_spi_board_info __initdata = { diff --git a/arch/arm/mach-omap2/common-board-devices.h b/arch/arm/mach-omap2/common-board-devices.h index 4c4ef6a6166..a0b4a42836a 100644 --- a/arch/arm/mach-omap2/common-board-devices.h +++ b/arch/arm/mach-omap2/common-board-devices.h @@ -4,7 +4,6 @@ #include "twl-common.h" #define NAND_BLOCK_SIZE SZ_128K -#define OMAP3_EVM_TS_GPIO 175 struct mtd_partition; struct ads7846_platform_data; |