diff options
| author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2017-12-21 14:54:15 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-12-22 14:31:16 +0100 |
| commit | 55c0858aeac78f4d4b088d8380ae98605fc02137 (patch) | |
| tree | e5628dcbcf018274d8e6f0365268ef93bff55ada | |
| parent | 2db4f87558436a5f6f6875ec5695bc15bb9e0529 (diff) | |
tegra: colibri_t30: colibri_t20: fix touch panel pins and reset
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-colibri_t20-pinmux.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c index e84e7958ff16..d6c8bb9872a2 100644 --- a/arch/arm/mach-tegra/board-colibri_t20-pinmux.c +++ b/arch/arm/mach-tegra/board-colibri_t20-pinmux.c @@ -382,5 +382,8 @@ 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); + gpio_request(TEGRA_GPIO_PK4, "Capacitive Touch Reset"); + gpio_direction_output(TEGRA_GPIO_PK4, 1); + return 0; } diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index 68f52c5b0506..6014b62e62a8 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -640,7 +640,7 @@ static struct i2c_board_info colibri_t30_i2c_bus1_board_info[] __initdata = { /* Atmel MAX TS 7 multi-touch controller */ I2C_BOARD_INFO("atmel_mxt_ts", 0x4a), .platform_data = &colibri_atmel_pdata, - .irq = TEGRA_GPIO_TO_IRQ( TEGRA_GPIO_PK3 ), + .irq = TEGRA_GPIO_TO_IRQ( TEGRA_GPIO_PR4 ), }, }; @@ -1790,6 +1790,10 @@ 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 */ + gpio_request(TEGRA_GPIO_PR7, "Capacitive Touch Reset"); + gpio_direction_output(TEGRA_GPIO_PR7, 1); + tegra_soc_device_init("Colibri T30"); } |