50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
|
From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
|
||
|
|
Date: Tue, 7 Jul 2015 13:47:39 +0000
|
||
|
|
Subject: ar71xx: Use *_eth_cfg helper for Open Mesh MR900 boards
|
||
|
|
|
||
|
|
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
|
||
|
|
|
||
|
|
Backport of r46241
|
||
|
|
|
||
|
|
Forwarded: https://patchwork.ozlabs.org/patch/624181/
|
||
|
|
|
||
|
|
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c
|
||
|
|
index fe3e1fa..9c3164d 100644
|
||
|
|
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c
|
||
|
|
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-mr900.c
|
||
|
|
@@ -94,24 +94,6 @@ static struct gpio_keys_button mr900_gpio_keys[] __initdata = {
|
||
|
|
},
|
||
|
|
};
|
||
|
|
|
||
|
|
-
|
||
|
|
-static void __init mr900_gmac_setup(void)
|
||
|
|
-{
|
||
|
|
- void __iomem *base;
|
||
|
|
- u32 t;
|
||
|
|
-
|
||
|
|
- base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
|
||
|
|
-
|
||
|
|
- t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
|
||
|
|
-
|
||
|
|
- t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
|
||
|
|
- t |= QCA955X_ETH_CFG_RGMII_EN;
|
||
|
|
-
|
||
|
|
- __raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);
|
||
|
|
-
|
||
|
|
- iounmap(base);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static void __init mr900_setup(void)
|
||
|
|
{
|
||
|
|
u8 *art = (u8 *)KSEG1ADDR(0x1fff0000);
|
||
|
|
@@ -141,8 +123,7 @@ static void __init mr900_setup(void)
|
||
|
|
}
|
||
|
|
pdata->use_eeprom = true;
|
||
|
|
|
||
|
|
- mr900_gmac_setup();
|
||
|
|
-
|
||
|
|
+ ath79_setup_qca955x_eth_cfg(QCA955X_ETH_CFG_RGMII_EN);
|
||
|
|
ath79_register_mdio(0, 0x0);
|
||
|
|
|
||
|
|
ath79_init_mac(ath79_eth0_data.mac_addr, art + MR900_MAC0_OFFSET, 0);
|