ENGR00180647-1: MX6 SABRESD: Add pin config for max11801

Configure PINMUX for max11801 driver on SABRESD_rev.B board.

Signed-off-by: Rong Dian <b38775@freescale.com>

diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index b0a4445dad0c5107fbeea5b0e67b51b05fe9b6fa..6a8a55cda5c9fd74a5ee4223bc7e1e5d2bc5d6ff 100644 (file)
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1064,7 +1064,7 @@ CONFIG_TOUCHSCREEN_EGALAX=y
 # CONFIG_TOUCHSCREEN_GUNZE is not set
 # CONFIG_TOUCHSCREEN_ELO is not set
 # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TOUCHSCREEN_MAX11801 is not set
+CONFIG_TOUCHSCREEN_MAX11801=y
 # CONFIG_TOUCHSCREEN_MCS5000 is not set
 # CONFIG_TOUCHSCREEN_MTOUCH is not set
 # CONFIG_TOUCHSCREEN_INEXIO is not set

diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c
index bf3ac5f7aba8543b9b23c40087758d591c5a657d..a4b96cdacea8e15e5cbafd4bd95f327e6c98e5c9 100644 (file)
--- a/arch/arm/mach-mx6/board-mx6q_sabresd.c
+++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c
@@ -196,6 +196,8 @@ static struct clk *sata_clk;
 static int mma8451_position = 3;
 static int mag3110_position;
 static int disable_ldb;
+static int max11801_mode = 1;
+
 
 extern char *gp_reg_id;
 extern int epdc_enabled;
@@ -761,6 +763,10 @@ static struct i2c_board_info mxc_i2c1_board_info[] __initdata = {
                I2C_BOARD_INFO("egalax_ts", 0x4),
                .irq = gpio_to_irq(SABRESD_CAP_TCH_INT0),
        },
+       {
+               I2C_BOARD_INFO("max11801", 0x48),
+               .platform_data = (void *)&max11801_mode,
+       },
 };
 
 static struct i2c_board_info mxc_i2c2_board_info[] __initdata = {
@@ -1566,7 +1572,6 @@ static void __init mx6_sabresd_board_init(void)
                gpio_direction_input(SABRESD_PFUZE_INT);
                mx6q_sabresd_init_pfuze100(SABRESD_PFUZE_INT);
        }
-
        /* SPI */
        imx6q_add_ecspi(0, &mx6q_sabresd_spi_data);
        spi_device_init();