summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-tegra/board-apalis_t30.c4
-rw-r--r--arch/arm/mach-tegra/board-colibri_t20-pinmux.c8
-rw-r--r--arch/arm/mach-tegra/board-colibri_t30.c9
3 files changed, 3 insertions, 18 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 */
diff --git a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c
index 5e793600d2b5..e2db57e783c4 100644
--- a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c
+++ b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c
@@ -382,13 +382,5 @@ int __init colibri_t20_pinmux_init(void)
gpio_request(TEGRA_GPIO_PT6, "GMI_WR_N on 93 RDnWR");
gpio_direction_output(TEGRA_GPIO_PT6, 0);
-#ifdef USE_CAPACITIVE_TOUCH_ADAPTER
- gpio_request(TEGRA_GPIO_PA6, "Capacitive Touch Reset");
- gpio_direction_output(TEGRA_GPIO_PA6, 1);
-#else
- gpio_request(TEGRA_GPIO_PK4, "Capacitive Touch Reset");
- gpio_direction_output(TEGRA_GPIO_PK4, 1);
-#endif
-
return 0;
}
diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c
index e827dcbc6fd1..e254dfcf0a4d 100644
--- a/arch/arm/mach-tegra/board-colibri_t30.c
+++ b/arch/arm/mach-tegra/board-colibri_t30.c
@@ -1799,15 +1799,6 @@ static void __init colibri_t30_init(void)
gpio_request(EN_MIC_GND, "EN_MIC_GND");
gpio_direction_output(EN_MIC_GND, 1);
- /* Release touch controller reset */
-#ifdef USE_CAPACITIVE_TOUCH_ADAPTER
- gpio_request(TEGRA_GPIO_PA6, "Capacitive Touch Reset");
- gpio_direction_output(TEGRA_GPIO_PA6, 1);
-#else
- gpio_request(TEGRA_GPIO_PR7, "Capacitive Touch Reset");
- gpio_direction_output(TEGRA_GPIO_PR7, 1);
-#endif
-
tegra_soc_device_init("Colibri T30");
}