summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/arm926ejs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-08-12 15:46:36 -0400
committerTom Rini <trini@konsulko.com>2015-08-13 07:19:41 -0400
commitfcd78fa604d994477fd209b9faab4a974b103250 (patch)
tree17f5e8cecaa3579e441372e6ec5cfeecdec11c61 /arch/arm/cpu/arm926ejs
parent4fbe41c4af483b082f525328796b7835536ae797 (diff)
parentfaa765d40760d84bff0de26a5a5f605621dbff39 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'arch/arm/cpu/arm926ejs')
-rw-r--r--arch/arm/cpu/arm926ejs/lpc32xx/devices.c7
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 b0287be62f..c0c9c6c312 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)