diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-apalis_t30.c | 7 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20.c | 9 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30.c | 9 |
3 files changed, 18 insertions, 7 deletions
diff --git a/arch/arm/mach-tegra/board-apalis_t30.c b/arch/arm/mach-tegra/board-apalis_t30.c index ababdb86dd01..6471d0a85f27 100644 --- a/arch/arm/mach-tegra/board-apalis_t30.c +++ b/arch/arm/mach-tegra/board-apalis_t30.c @@ -555,8 +555,9 @@ static int pinmux_fusion_pins(void) * sure input/output muxing is done and the GPIO is freed here. */ static struct mxt_platform_data apalis_atmel_pdata = { - .suspend_mode = MXT_SUSPEND_T9_CTRL, - .irqflags = IRQF_TRIGGER_FALLING, + .suspend_mode = MXT_SUSPEND_T9_CTRL, + .irqflags = IRQF_TRIGGER_FALLING, + .gpio_reset = APALIS_GPIO6, }; /* I2C */ @@ -580,7 +581,7 @@ static struct i2c_board_info apalis_t30_i2c_bus1_board_info[] __initdata = { /* Atmel MAX TS 7 multi-touch controller */ I2C_BOARD_INFO("atmel_mxt_ts", 0x4a), .platform_data = &apalis_atmel_pdata, - .irq = TEGRA_GPIO_TO_IRQ( APALIS_GPIO5 ), + .irq = TEGRA_GPIO_TO_IRQ( APALIS_GPIO5 ), }, }; diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c index 71892627b587..8471778c8b93 100644 --- a/arch/arm/mach-tegra/board-colibri_t20.c +++ b/arch/arm/mach-tegra/board-colibri_t20.c @@ -644,8 +644,13 @@ static struct fusion_f0710a_init_data colibri_fusion_pdata = { * sure input/output muxing is done and the GPIO is freed here. */ static struct mxt_platform_data colibri_atmel_pdata = { - .suspend_mode = MXT_SUSPEND_T9_CTRL, - .irqflags = IRQF_TRIGGER_FALLING, + .suspend_mode = MXT_SUSPEND_T9_CTRL, + .irqflags = IRQF_TRIGGER_FALLING, +#ifdef USE_CAPACITIVE_TOUCH_ADAPTER + .gpio_reset = TEGRA_GPIO_PA6, +#else + .gpio_reset = TEGRA_GPIO_PK3, +#endif }; /* I2C */ diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index 8c77150c16c2..e827dcbc6fd1 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -615,8 +615,13 @@ static struct fusion_f0710a_init_data colibri_fusion_pdata = { * sure input/output muxing is done and the GPIO is freed here. */ static struct mxt_platform_data colibri_atmel_pdata = { - .suspend_mode = MXT_SUSPEND_T9_CTRL, - .irqflags = IRQF_TRIGGER_FALLING, + .suspend_mode = MXT_SUSPEND_T9_CTRL, + .irqflags = IRQF_TRIGGER_FALLING, +#ifdef USE_CAPACITIVE_TOUCH_ADAPTER + .gpio_reset = TEGRA_GPIO_PA6, +#else + .gpio_reset = TEGRA_GPIO_PR7, +#endif }; /* I2C */ |