diff options
| author | Tom Rini <trini@ti.com> | 2013-08-18 14:14:34 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-08-18 14:14:34 -0400 |
| commit | e20cc2ca15b5b0644f51b6e58d530d70acd2bc00 (patch) | |
| tree | f85a22536682ef54e77b1ba95cf0b71d00644632 /board/ti/dra7xx/mux_data.h | |
| parent | f21876174364391757e743cb8673d3fc5fce7ac7 (diff) | |
| parent | 9ed887caecb9ecb0c68773a1870d143b9f28d3da (diff) | |
| download | blackbird-obmc-uboot-e20cc2ca15b5b0644f51b6e58d530d70acd2bc00.tar.gz blackbird-obmc-uboot-e20cc2ca15b5b0644f51b6e58d530d70acd2bc00.zip | |
Merge branch 'master' of git://88.191.163.10/u-boot-arm
Fixup an easy conflict over adding the clk_get prototype and USB_OTG
defines for am33xx having moved.
Conflicts:
arch/arm/include/asm/arch-am33xx/hardware.h
Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'board/ti/dra7xx/mux_data.h')
| -rw-r--r-- | board/ti/dra7xx/mux_data.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/board/ti/dra7xx/mux_data.h b/board/ti/dra7xx/mux_data.h index ec8342276b..0a86594c6b 100644 --- a/board/ti/dra7xx/mux_data.h +++ b/board/ti/dra7xx/mux_data.h @@ -37,5 +37,19 @@ const struct pad_conf_entry core_padconf_array_essential[] = { {UART1_RTSN, (IEN | PTU | PDIS | M3)}, /* UART1_RTSN */ {I2C1_SDA, (IEN | PTU | PDIS | M0)}, /* I2C1_SDA */ {I2C1_SCL, (IEN | PTU | PDIS | M0)}, /* I2C1_SCL */ + {MDIO_MCLK, (PTU | PEN | M0)}, /* MDIO_MCLK */ + {MDIO_D, (IEN | PTU | PEN | M0)}, /* MDIO_D */ + {RGMII0_TXC, (M0) }, + {RGMII0_TXCTL, (M0) }, + {RGMII0_TXD3, (M0) }, + {RGMII0_TXD2, (M0) }, + {RGMII0_TXD1, (M0) }, + {RGMII0_TXD0, (M0) }, + {RGMII0_RXC, (IEN | M0) }, + {RGMII0_RXCTL, (IEN | M0) }, + {RGMII0_RXD3, (IEN | M0) }, + {RGMII0_RXD2, (IEN | M0) }, + {RGMII0_RXD1, (IEN | M0) }, + {RGMII0_RXD0, (IEN | M0) }, }; #endif /* _MUX_DATA_DRA7XX_H_ */ |
