diff options
author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2018-05-17 11:51:28 +0200 |
---|---|---|
committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2018-06-19 16:32:07 +0200 |
commit | 299c8b12f311b89090647255662e88d47840d771 (patch) | |
tree | df58f941cecc8cd022618f9c913d7fd0ba27f0c5 /arch/arm/mach-tegra/board-apalis_t30.c | |
parent | 9c36b02fa9c00bb7fa4209e7ff80a332b8de0e40 (diff) |
apalis_t30: colibri_t30: colibri_t20: do not configure touchscreen reset line
Leave reset line setup to the capacitive touch drivers.
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-apalis_t30.c')
-rw-r--r-- | arch/arm/mach-tegra/board-apalis_t30.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-apalis_t30.c b/arch/arm/mach-tegra/board-apalis_t30.c index 4db8957d8ccf..fdbc2c10230e 100644 --- a/arch/arm/mach-tegra/board-apalis_t30.c +++ b/arch/arm/mach-tegra/board-apalis_t30.c @@ -508,7 +508,9 @@ static struct gpio apalis_t30_gpios[] = { #ifndef POWER_GPIO {APALIS_GPIO5, GPIOF_IN, "GPIO5 X1-9"}, #endif -#ifndef FORCE_OFF_GPIO +#if !defined(CONFIG_TOUCHSCREEN_ATMEL_MXT) \ + && !defined(CONFIG_TOUCHSCREEN_ATMEL_MXT_MODULE) \ + && !defined(FORCE_OFF_GPIO) {APALIS_GPIO6, GPIOF_OUT_INIT_HIGH, "GPIO6 X1-11"}, #endif /* GPIO7 is used by PCIe driver on Evaluation board */ |