diff options
author | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-07-03 17:04:57 -0700 |
---|---|---|
committer | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-07-03 17:04:57 -0700 |
commit | 2f0c84b3619deaaebeb3daa0166bed54bfdac190 (patch) | |
tree | 121ecf51a8d628f9f9af642f859dcf8956a2d508 /arch/arm/mach-mx6/board-mx6q_sabrelite.c | |
parent | bfecaa2c2dc7583a42523c2ab136d21a97887289 (diff) | |
parent | e06baef465e2ee37e286b264182d4a23f8f2c067 (diff) |
Merge branch 'boundary-L3.0.15_12.04.01' of github.com:boundarydevices/linux-imx6 into boundary-L3.0.15_12.04.013.0-boundary-imx6-201207031704
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_sabrelite.c')
-rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabrelite.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabrelite.c b/arch/arm/mach-mx6/board-mx6q_sabrelite.c index fed83bd95a20..c0065bfc24d4 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabrelite.c +++ b/arch/arm/mach-mx6/board-mx6q_sabrelite.c @@ -694,6 +694,13 @@ static struct i2c_board_info mxc_i2c2_board_info[] __initdata = { .platform_data = &tsc2007_info, .irq = gpio_to_irq(MX6Q_SABRELITE_DRGB_IRQGPIO), }, +#if defined(CONFIG_TOUCHSCREEN_FT5X06) \ + || defined(CONFIG_TOUCHSCREEN_FT5X06_MODULE) + { + I2C_BOARD_INFO("ft5x06-ts", 0x38), + .irq = gpio_to_irq(MX6Q_SABRELITE_CAP_TCH_INT1), + }, +#endif }; static void imx6q_sabrelite_usbotg_vbus(bool on) @@ -970,6 +977,7 @@ static void __init sabrelite_add_device_buttons(void) {} static iomux_v3_cfg_t n6x_sd2_pads[] = { MX6Q_USDHC_PAD_SETTING(2, 50), + MX6Q_PAD_SD1_CLK__OSC32K_32K_OUT, }; #ifdef CONFIG_WL12XX_PLATFORM_DATA @@ -1257,8 +1265,8 @@ static void __init mx6_sabrelite_board_init(void) imx6q_add_anatop_thermal_imx(1, &mx6q_sabrelite_anatop_thermal_data); imx6_init_fec(fec_data); imx6q_add_pm_imx(0, &mx6q_sabrelite_pm_data); - imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabrelite_sd4_data); imx6q_add_sdhci_usdhc_imx(2, &mx6q_sabrelite_sd3_data); + imx6q_add_sdhci_usdhc_imx(3, &mx6q_sabrelite_sd4_data); imx_add_viv_gpu(&imx6_gpu_data, &imx6q_gpu_pdata); imx6q_sabrelite_init_usb(); imx6q_add_ahci(0, &mx6q_sabrelite_sata_data); |