diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-10-17 18:27:47 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-10-17 18:27:47 +0000 |
| commit | 991bc12eb083826ba593b076628ebe3492927d6f (patch) | |
| tree | dd041a09f72acde344c11fb458af8deaa9ce751c /target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c | |
| parent | 5e39bae8bdfaf0cf5ba3a40f8b343c699b502510 (diff) | |
| download | master-187ad058-991bc12eb083826ba593b076628ebe3492927d6f.tar.gz master-187ad058-991bc12eb083826ba593b076628ebe3492927d6f.tar.bz2 master-187ad058-991bc12eb083826ba593b076628ebe3492927d6f.zip | |
ar71xx: use the ath79_set_ar934x_eth_cfg helper in machine setup routines
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33818 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c')
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c index 1855349a39..f6165273d8 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-om2p.c @@ -175,27 +175,6 @@ static void __init om2p_lc_setup(void) MIPS_MACHINE(ATH79_MACH_OM2P_LC, "OM2P-LC", "OpenMesh OM2P LC", om2p_lc_setup); - -static void __init om2p_hs_gmac_setup(void) -{ - void __iomem *base; - u32 t; - - base = ioremap(AR934X_GMAC_BASE, AR934X_GMAC_SIZE); - - t = __raw_readl(base + AR934X_GMAC_REG_ETH_CFG); - - t &= ~(AR934X_ETH_CFG_RGMII_GMAC0 | AR934X_ETH_CFG_MII_GMAC0 | - AR934X_ETH_CFG_GMII_GMAC0 | AR934X_ETH_CFG_SW_ONLY_MODE | - AR934X_ETH_CFG_SW_PHY_SWAP); - - t |= AR934X_ETH_CFG_SW_PHY_SWAP; - __raw_writel(t, base + AR934X_GMAC_REG_ETH_CFG); - t = __raw_readl(base + AR934X_GMAC_REG_ETH_CFG); - - iounmap(base); -} - static void __init om2p_hs_setup(void) { u8 *mac1 = (u8 *)KSEG1ADDR(0x1ffc0000); @@ -222,7 +201,7 @@ static void __init om2p_hs_setup(void) ath79_register_wmac(art, NULL); - om2p_hs_gmac_setup(); + ath79_setup_ar934x_eth_cfg(AR934X_ETH_CFG_SW_PHY_SWAP); ath79_register_mdio(1, 0x0); ath79_init_mac(ath79_eth0_data.mac_addr, mac1, 0); |