summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorAhmad Fatoum <a.fatoum@pengutronix.de>2020-01-17 19:17:16 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2020-01-20 08:53:19 +0100
commit70fcc51b1066d69b7042035d64e797eea5e75d6c (patch)
tree2a9b44b06b9176cee4710c0bdb9de84d8e255ec6 /drivers/net
parent6745b22a18733425fd0b9d28c744cdc414a8d7a9 (diff)
downloadbarebox-70fcc51b1066d69b7042035d64e797eea5e75d6c.tar.gz
net: designware: eqos: don't funnel all MDIO writes to register 0
eqos_mdio_write ended up using the addr parameter instead of the computed miiaddr variable, which would've factored in the reg parameter. This had the effect that all writes went to PHY register 0, which was fine as long as there were only register 0 writes. As soon there are more writes, e.g. because a PHY driver was enabled, register 0 became clobbered and erratic behavior ensued. Fix the typo and while at it rename the val parameter to a more descriptive name. Fixes: a4f709bbb ("net: add Designware Ethernet QoS for STM32MP") Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/designware_eqos.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/designware_eqos.c b/drivers/net/designware_eqos.c
index da67adf..4ae07fe 100644
--- a/drivers/net/designware_eqos.c
+++ b/drivers/net/designware_eqos.c
@@ -229,7 +229,7 @@ static int eqos_mdio_read(struct mii_bus *bus, int addr, int reg)
return readl(&eqos->mac_regs->mdio_data) & 0xffff;
}
-static int eqos_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val)
+static int eqos_mdio_write(struct mii_bus *bus, int addr, int reg, u16 data)
{
struct eqos *eqos = bus->priv;
u32 miiaddr = 0;
@@ -249,8 +249,8 @@ static int eqos_mdio_write(struct mii_bus *bus, int addr, int reg, u16 val)
miiaddr |= EQOS_MDIO_ADDR(addr) | EQOS_MDIO_REG(reg);
miiaddr |= MII_BUSY;
- writel(val, &eqos->mac_regs->mdio_data);
- writel(addr, &eqos->mac_regs->mdio_address);
+ writel(data, &eqos->mac_regs->mdio_data);
+ writel(miiaddr, &eqos->mac_regs->mdio_address);
udelay(eqos->ops->mdio_wait_us);