diff options
author | Tom Rini <trini@konsulko.com> | 2015-08-12 19:46:36 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-08-13 11:19:41 (GMT) |
commit | fcd78fa604d994477fd209b9faab4a974b103250 (patch) | |
tree | 17f5e8cecaa3579e441372e6ec5cfeecdec11c61 /arch/arm | |
parent | 4fbe41c4af483b082f525328796b7835536ae797 (diff) | |
parent | faa765d40760d84bff0de26a5a5f605621dbff39 (diff) | |
download | u-boot-fsl-qoriq-fcd78fa604d994477fd209b9faab4a974b103250.tar.xz |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c b/arch/arm/cpu/arm926ejs/lpc32xx/devices.c index b0287be..c0c9c6c 100644 --- a/arch/arm/cpu/arm926ejs/lpc32xx/devices.c +++ b/arch/arm/cpu/arm926ejs/lpc32xx/devices.c @@ -45,7 +45,12 @@ void lpc32xx_mac_init(void) { /* Enable MAC interface */ writel(CLK_MAC_REG | CLK_MAC_SLAVE | CLK_MAC_MASTER - | CLK_MAC_MII, &clk->macclk_ctrl); +#if defined(CONFIG_RMII) + | CLK_MAC_RMII, +#else + | CLK_MAC_MII, +#endif + &clk->macclk_ctrl); } void lpc32xx_mlc_nand_init(void) |