diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvf/board-twr-vf700.c | 6 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mvf.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/mach-mvf/board-twr-vf700.c b/arch/arm/mach-mvf/board-twr-vf700.c index c672fb3103b5..af8836a783a1 100644 --- a/arch/arm/mach-mvf/board-twr-vf700.c +++ b/arch/arm/mach-mvf/board-twr-vf700.c @@ -186,6 +186,9 @@ static iomux_v3_cfg_t mvf600_pads[] = { MVF600_PAD29_PTB7_FTM0CH7, /*MVF600_PAD30_PTB8_FTM1CH0,*/ MVF600_PAD31_PTB9_FTM1CH1, + + /* Touch Screen */ + MVF600_PAD21_PTA31_TS_IRQ, }; static struct mxc_audio_platform_data mvf_twr_audio_data; @@ -346,6 +349,9 @@ static struct i2c_board_info mxc_i2c0_board_info[] __initdata = { { I2C_BOARD_INFO("sgtl5000", 0x0a), }, + { + I2C_BOARD_INFO("crtouch_ts", 0x49), + }, }; static struct mxc_nand_platform_data mvf_data __initdata = { diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h index 3c46ad41e8eb..ea661abc0126 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h @@ -304,4 +304,10 @@ typedef enum iomux_config { IOMUX_PAD(0x0078, 0x0078, 1, 0x032C, 0, MVF600_FTM1_CH_CTRL) #define MVF600_PAD31_PTB9_FTM1CH1 \ IOMUX_PAD(0x007C, 0x007C, 1, 0x0330, 0, MVF600_FTM1_CH_CTRL) + +/* Touch Screen */ +#define MVF600_PAD21_PTA31_TS_IRQ \ + IOMUX_PAD(0x0054, 0x0054, 0, 0x0000, 0, \ + MVF600_GPIO_GENERAL_CTRL | PAD_CTL_IBE_ENABLE) + #endif |