diff options
| -rw-r--r-- | arch/arm/configs/colibri_t30_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t30.c | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/configs/colibri_t30_defconfig b/arch/arm/configs/colibri_t30_defconfig index 792810137d9a..c4315a323b56 100644 --- a/arch/arm/configs/colibri_t30_defconfig +++ b/arch/arm/configs/colibri_t30_defconfig @@ -188,6 +188,7 @@ CONFIG_INPUT_KEYRESET=y CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ATMEL_MXT=m CONFIG_TOUCHSCREEN_STMPE=y CONFIG_TOUCHSCREEN_FUSION_F0710A=m CONFIG_INPUT_MISC=y diff --git a/arch/arm/mach-tegra/board-colibri_t30.c b/arch/arm/mach-tegra/board-colibri_t30.c index 286f11044296..ea72781a31fb 100644 --- a/arch/arm/mach-tegra/board-colibri_t30.c +++ b/arch/arm/mach-tegra/board-colibri_t30.c @@ -19,6 +19,7 @@ #include <linux/i2c-tegra.h> #include <linux/input.h> #include <linux/input/fusion_F0710A.h> +#include <linux/platform_data/atmel_mxt_ts.h> #include <linux/io.h> #include <linux/leds_pwm.h> #include <linux/lm95245.h> @@ -607,6 +608,17 @@ static struct fusion_f0710a_init_data colibri_fusion_pdata = { .gpio_reset = TEGRA_GPIO_PA6, /* SO-DIMM 30: Reset interrupt */ }; +/* + * Atmel touch screen GPIOs (using Toradex display/touch adapter) + * Aster X3-4, SODIMM pin 107 , pen down interrupt + * gpio_request muxes the GPIO function automatically, we only have to make + * 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, +}; + /* I2C */ /* Make sure that the pinmuxing enable the 'open drain' feature for pins used @@ -624,6 +636,12 @@ static struct i2c_board_info colibri_t30_i2c_bus1_board_info[] __initdata = { I2C_BOARD_INFO("fusion_F0710A", 0x10), .platform_data = &colibri_fusion_pdata, }, + { + /* 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 ), + }, }; static struct tegra_i2c_platform_data colibri_t30_i2c1_platform_data = { |