diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2014-01-02 15:11:11 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2014-01-02 15:11:11 -0700 |
| commit | 4007673c6cbc200f1a153b403283f39e41e3423f (patch) | |
| tree | 0a6872eefad211d60c18f8e00fe528c99bba8919 | |
| parent | db027be3898f3f4a8e98664cd91dfd79c99707c6 (diff) | |
sp: add AR1020 touch screen on I2C3
Signed-off-by: Eric Nelson <eric.nelson@boundarydevices.com>
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6_sp.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-mx6/pads-mx6_sp.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-mx6/board-mx6_sp.c b/arch/arm/mach-mx6/board-mx6_sp.c index bb89c377fc7e..2902a75e63dd 100644 --- a/arch/arm/mach-mx6/board-mx6_sp.c +++ b/arch/arm/mach-mx6/board-mx6_sp.c @@ -90,7 +90,7 @@ #define ST_ECSPI1_CS1 IMX_GPIO_NR(3, 19) /* EIM_D19 - active low */ #define TOUCH_RESET IMX_GPIO_NR(1, 4) /* GPIO_4 - active low */ -#define TOUCH_IRQ IMX_GPIO_NR(2, 27) /* EIM_LBA - active low */ +#define TOUCH_IRQ IMX_GPIO_NR(7, 1) /* SD3_DAT4 - active low */ #define CAP_TCH_INT IMX_GPIO_NR(1, 9) /* GPIO_9 - J7: pin 4: active low */ @@ -304,6 +304,10 @@ static struct imxi2c_platform_data mx6_i2c_data = { }; static struct i2c_board_info mxc_i2c0_board_info[] __initdata = { + { + I2C_BOARD_INFO("ar1020_i2c", 0x4d), /* Touchscreen */ + .irq = gpio_to_irq(TOUCH_IRQ), /* GPIO_7 */ + }, }; static struct i2c_board_info mxc_i2c1_board_info[] __initdata = { diff --git a/arch/arm/mach-mx6/pads-mx6_sp.h b/arch/arm/mach-mx6/pads-mx6_sp.h index e66b1d654864..7870b7d3c982 100644 --- a/arch/arm/mach-mx6/pads-mx6_sp.h +++ b/arch/arm/mach-mx6/pads-mx6_sp.h @@ -108,9 +108,9 @@ static iomux_v3_cfg_t MX6NAME(common_pads)[] = { MX6PAD(EIM_D18__ECSPI1_MOSI), NEW_PAD_CTRL(MX6PAD(EIM_D19__GPIO_3_19), WEAK), /*SS1*/ - /* Touchscreen - tsc2004 - I2C3 */ + /* Touchscreen - AR1020 - I2C3 */ NEW_PAD_CTRL(MX6PAD(GPIO_4__GPIO_1_4), WEAK), /* Reset - active low */ - NEW_PAD_CTRL(MX6PAD(EIM_LBA__GPIO_2_27), WEAK_IRQ), /* interrrupt */ + NEW_PAD_CTRL(MX6PAD(SD3_DAT4__GPIO_7_1), WEAK_IRQ), /* interrrupt */ /* UART1 */ MX6PAD(SD3_DAT6__UART1_RXD), |