diff options
| author | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-17 13:17:30 +0800 |
|---|---|---|
| committer | guoyin.chen <guoyin.chen@freescale.com> | 2013-04-17 13:17:30 +0800 |
| commit | 3b9608406bb699de5ff02760c745e62212b4c280 (patch) | |
| tree | 1cedd6fff5d0c2f512cee15f74fb9dc867b7e328 /arch/arm/mach-mx6/board-mx6q_sabresd.h | |
| parent | bc275dcec0026997a8a8b685ce65c6f766ff38ce (diff) | |
| parent | 556681e28fda1c92eb2178306904a7df87f37449 (diff) | |
Merge remote-tracking branch 'fsl-linux-sdk/imx_3.0.35_4.0.0' into imx_3.0.35_androidjb4.2.2_1.0.0-ga
Diffstat (limited to 'arch/arm/mach-mx6/board-mx6q_sabresd.h')
| -rw-r--r-- | arch/arm/mach-mx6/board-mx6q_sabresd.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.h b/arch/arm/mach-mx6/board-mx6q_sabresd.h index 73ee909e50ef..b2bb8c923f0f 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.h +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.h @@ -132,9 +132,13 @@ static iomux_v3_cfg_t mx6q_sabresd_pads[] = { MX6Q_PAD_KEY_COL3__I2C2_SCL, MX6Q_PAD_KEY_ROW3__I2C2_SDA, +#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO + MX6Q_PAD_GPIO_6__OBSERVE_MUX_OBSRV_INT_OUT1, +#else /* I2C3 */ MX6Q_PAD_GPIO_3__I2C3_SCL, /* GPIO1[3] */ MX6Q_PAD_GPIO_6__I2C3_SDA, +#endif /* DISPLAY */ MX6Q_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK, |