summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2018-10-03 08:24:09 +0200
committerDominik Sliwa <dominik.sliwa@toradex.com>2018-10-04 18:05:11 +0200
commit16cfb069d7d79e26a0a0399bafac5f169882fcfc (patch)
treeb5d4fce0af4cbc8e63a48ad4a7eef56435600588
parent2a1eb198705c855be56f2d237f9c99edbff167e3 (diff)
colibri_t20: corrected reset-pin for capacitive touch on T20
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>
-rw-r--r--arch/arm/mach-tegra/board-colibri_t20.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20.c b/arch/arm/mach-tegra/board-colibri_t20.c
index 37188b1..cd5b3e3 100644
--- a/arch/arm/mach-tegra/board-colibri_t20.c
+++ b/arch/arm/mach-tegra/board-colibri_t20.c
@@ -521,8 +521,10 @@ static struct gpio colibri_t20_gpios[] = {
{TEGRA_GPIO_PK0, GPIOF_IN, "SODIMM pin 150"},
//multiplexed OWR
{TEGRA_GPIO_PK1, GPIOF_IN, "SODIMM pin 152"},
-#if !defined(MECS_TELLURIUM) || (!defined(CONFIG_CAN_MCP251X) && \
- !defined(CONFIG_CAN_MCP251X_MODULE))
+#if (!defined(MECS_TELLURIUM) || (!defined(CONFIG_CAN_MCP251X) && \
+ !defined(CONFIG_CAN_MCP251X_MODULE))) && \
+ (!defined(CONFIG_TOUCHSCREEN_ATMEL_MXT) && \
+ !defined(CONFIG_TOUCHSCREEN_ATMEL_MXT_MODULE))
//conflicts with CAN reset on MECS Tellurium xPOD1 CAN
{TEGRA_GPIO_PK4, GPIOF_IN, "SODIMM pin 106"},
#endif
@@ -649,7 +651,7 @@ static struct mxt_platform_data colibri_atmel_pdata = {
#ifdef USE_CAPACITIVE_TOUCH_ADAPTER
.gpio_reset = TEGRA_GPIO_PA6,
#else
- .gpio_reset = TEGRA_GPIO_PK3,
+ .gpio_reset = TEGRA_GPIO_PK4,
#endif
};