summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Sliwa <dominik.sliwa@toradex.com>2018-05-01 11:31:42 +0200
committerDominik Sliwa <dominik.sliwa@toradex.com>2018-06-19 16:30:40 +0200
commit96dd694e888d8d51c46ad4b16714fda619cfd6a8 (patch)
tree513323b003ae6073d4ee6f3bb59850adfd21e454
parent28531a1ff5ca27c0ab7e2f99bbb0058858b72aa5 (diff)
apalis/colibri_t20/t30: configure 7in capacitive touch reset line
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com> Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-rw-r--r--arch/arm/mach-tegra/board-apalis_t30.c7
-rw-r--r--arch/arm/mach-tegra/board-colibri_t20.c9
-rw-r--r--arch/arm/mach-tegra/board-colibri_t30.c9
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 ababdb8..6471d0a 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 7189262..8471778 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 8c77150..e827dcb 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 */