diff options
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/iomux-mx6dl.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mx6dl.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/iomux-mx6dl.h b/arch/arm/plat-mxc/include/mach/iomux-mx6dl.h index dbfc9a2d8012..513cc8d33a2c 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mx6dl.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mx6dl.h @@ -89,6 +89,9 @@ #define MX6DL_GPMI_PAD_CTRL2 (MX6DL_GPMI_PAD_CTRL0 | MX6DL_GPMI_PAD_CTRL1) #define MX6DL_SPDIF_OUT_PAD_CTRL (PAD_CTL_DSE_120ohm | PAD_CTL_SRE_FAST) +#define ENET_IRQ_PAD_CTRL (PAD_CTL_SRE_FAST | PAD_CTL_DSE_40ohm | \ + PAD_CTL_SPEED_MED) + #define MX6DL_PAD_CSI0_DAT10__IPU1_CSI0_D_10 \ IOMUX_PAD(0x0360, 0x004C, 0, 0x0000, 0, NO_PAD_CTRL) #define MX6DL_PAD_CSI0_DAT10__AUDMUX_AUD3_RXC \ @@ -2524,10 +2527,14 @@ #define MX6DL_PAD_GPIO_5__SIMBA_EVENTI \ IOMUX_PAD(0x0600, 0x0230, 7, 0x0000, 0, NO_PAD_CTRL) -#define MX6DL_PAD_GPIO_6__ESAI1_SCKT \ - IOMUX_PAD(0x0604, 0x0234, 0, 0x0840, 1, NO_PAD_CTRL) +#ifdef CONFIG_MX6_ENET_IRQ_TO_GPIO +#define MX6DL_PAD_GPIO_6__OBSERVE_MUX_OBSRV_INT_OUT1 \ + IOMUX_PAD(0x0604, 0x0234, 1 | IOMUX_CONFIG_SION, 0x0000, 0, ENET_IRQ_PAD_CTRL) +#else #define MX6DL_PAD_GPIO_6__OBSERVE_MUX_OBSRV_INT_OUT1 \ IOMUX_PAD(0x0604, 0x0234, 1, 0x0000, 0, NO_PAD_CTRL) +#define MX6DL_PAD_GPIO_6__ESAI1_SCKT \ + IOMUX_PAD(0x0604, 0x0234, 0, 0x0840, 1, NO_PAD_CTRL) #define MX6DL_PAD_GPIO_6__I2C3_SDA \ IOMUX_PAD(0x0604, 0x0234, 2 | IOMUX_CONFIG_SION, 0x087C, 2, MX6DL_I2C_PAD_CTRL) #define MX6DL_PAD_GPIO_6__CCM_CCM_OUT_0 \ @@ -2540,6 +2547,7 @@ IOMUX_PAD(0x0604, 0x0234, 6, 0x0000, 0, MX6DL_USDHC_PAD_CTRL) #define MX6DL_PAD_GPIO_6__MLB_MLBSIG \ IOMUX_PAD(0x0604, 0x0234, 7, 0x08E4, 1, MX6DL_MLB150_PAD_CTRL) +#endif #define MX6DL_PAD_GPIO_7__ESAI1_TX4_RX1 \ IOMUX_PAD(0x0608, 0x0238, 0, 0x0854, 1, NO_PAD_CTRL) |