diff options
| author | Frank Li <Frank.Li@freescale.com> | 2011-08-29 13:58:48 +0800 |
|---|---|---|
| committer | Frank Li <Frank.Li@freescale.com> | 2011-08-30 17:08:57 +0800 |
| commit | 9fb2acc5b76620f9207a609dd02dc762a72de95c (patch) | |
| tree | b9a6fd935b650b0d8e50638b5eacdbfeb22b4a15 /arch/arm | |
| parent | f0ae7c02a330e8d9bfe5aa3e230c8bd0e30cd146 (diff) | |
ENGR00153925 MX6Q: Fix EGA touch failure on lvds2 port
lvds2 port use i2c3 port.
Add EGA i2c register data to i2c port3.
but two touch can't work at the same time because irq conflict.
Signed-off-by: Frank Li <Frank.Li@freescale.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabreauto.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabreauto.c b/arch/arm/mach-mx6/board-mx6q_sabreauto.c index 9034c163017..08e523c968f 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabreauto.c +++ b/arch/arm/mach-mx6/board-mx6q_sabreauto.c @@ -435,15 +435,11 @@ static struct i2c_board_info mxc_i2c2_board_info[] __initdata = { .platform_data = &sabr_ddc_dvi_data, .irq = gpio_to_irq(MX6Q_SABREAUTO_DISP0_DET_INT), }, -}; - -static int p1003_ts_hw_status(void) -{ - return gpio_get_value(MX6Q_SABREAUTO_CAP_TCH_INT); -} + { + I2C_BOARD_INFO("egalax_ts", 0x4), + .irq = gpio_to_irq(MX6Q_SABREAUTO_CAP_TCH_INT), + }, -static struct p1003_ts_platform_data p1003_ts_data = { - .hw_status = p1003_ts_hw_status, }; static struct i2c_board_info mxc_i2c1_board_info[] __initdata = { @@ -452,11 +448,6 @@ static struct i2c_board_info mxc_i2c1_board_info[] __initdata = { .irq = gpio_to_irq(MX6Q_SABREAUTO_CAP_TCH_INT), }, { - I2C_BOARD_INFO("p1003_fwv33", 0x41), - .irq = gpio_to_irq(MX6Q_SABREAUTO_CAP_TCH_INT), - .platform_data = &p1003_ts_data, - }, - { I2C_BOARD_INFO("mxc_hdmi_i2c", 0x50), }, }; |