X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Fath79%2Fdev-eth.c;h=b43c80a3762ddebe46d8443660714922165a2287;hb=2cbbf1d743144f1665d1d44bbf6b736404df5140;hp=6445023ec45d402b48a41566125d14aca16e7d58;hpb=f2d4bb96b62512caa161dcc2867c91692fb16a38;p=openwrt.git

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
index 6445023ec4..b43c80a376 100644
--- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
@@ -830,38 +830,18 @@ void __init ath79_setup_ar934x_eth_rx_delay(unsigned int rxd,
 	iounmap(base);
 }
 
-void __init ath79_setup_qca955x_eth_cfg(u32 mask,
-					unsigned int rxd, unsigned int rxdv,
-					unsigned int txd, unsigned int txe)
+void __init ath79_setup_qca955x_eth_cfg(u32 mask)
 {
 	void __iomem *base;
-	u32 t, m;
-
-	m = QCA955X_ETH_CFG_RGMII_EN |
-	    QCA955X_ETH_CFG_MII_GE0 |
-	    QCA955X_ETH_CFG_GMII_GE0 |
-	    QCA955X_ETH_CFG_MII_GE0_MASTER |
-	    QCA955X_ETH_CFG_MII_GE0_SLAVE |
-	    QCA955X_ETH_CFG_GE0_ERR_EN |
-	    QCA955X_ETH_CFG_GE0_SGMII |
-	    QCA955X_ETH_CFG_RMII_GE0 |
-	    QCA955X_ETH_CFG_MII_CNTL_SPEED |
-	    QCA955X_ETH_CFG_RMII_GE0_MASTER;
-	m |= QCA955X_ETH_CFG_RXD_DELAY_MASK << QCA955X_ETH_CFG_RXD_DELAY_SHIFT;
-	m |= QCA955X_ETH_CFG_RDV_DELAY_MASK << QCA955X_ETH_CFG_RDV_DELAY_SHIFT;
-	m |= QCA955X_ETH_CFG_TXD_DELAY_MASK << QCA955X_ETH_CFG_TXD_DELAY_SHIFT;
-	m |= QCA955X_ETH_CFG_TXE_DELAY_MASK << QCA955X_ETH_CFG_TXE_DELAY_SHIFT;
+	u32 t;
 
 	base = ioremap(QCA955X_GMAC_BASE, QCA955X_GMAC_SIZE);
 
 	t = __raw_readl(base + QCA955X_GMAC_REG_ETH_CFG);
 
-	t &= ~m;
+	t &= ~(QCA955X_ETH_CFG_RGMII_EN | QCA955X_ETH_CFG_GE0_SGMII);
+
 	t |= mask;
-	t |= rxd << QCA955X_ETH_CFG_RXD_DELAY_SHIFT;
-	t |= rxdv << QCA955X_ETH_CFG_RDV_DELAY_SHIFT;
-	t |= txd << QCA955X_ETH_CFG_TXD_DELAY_SHIFT;
-	t |= txe << QCA955X_ETH_CFG_TXE_DELAY_SHIFT;
 
 	__raw_writel(t, base + QCA955X_GMAC_REG_ETH_CFG);