summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosef Holzmayr <holzmayr@rsi-elektrotechnik.de>2019-10-02 21:22:52 +0200
committerJoe Hershberger <joe.hershberger@ni.com>2019-12-09 09:47:42 -0600
commit7c56408be61ec5597c944bb67c034e7bf01922d5 (patch)
tree3ac6fd09822b2bac9219f439253a99a56d8696f9
parent0d3044c210c7a7078c4150bfc67927c25ef0d958 (diff)
net: macb: let miiphy_read/_write pass arbitrary addresses
This allows passing arbitrary addresses through macb_miiphy_read and macb_miiphy_write, therefore enabling the mii command to access all mdio bus devices instead of only the defined phy. Signed-off-by: Josef Holzmayr <holzmayr@rsi-elektrotechnik.de> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
-rw-r--r--drivers/net/macb.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 0f0ede1dc0..8359425378 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -241,11 +241,8 @@ int macb_miiphy_read(struct mii_dev *bus, int phy_adr, int devad, int reg)
struct macb_device *macb = to_macb(dev);
#endif
- if (macb->phy_addr != phy_adr)
- return -1;
-
arch_get_mdio_control(bus->name);
- value = macb_mdio_read(macb, macb->phy_addr, reg);
+ value = macb_mdio_read(macb, phy_adr, reg);
return value;
}
@@ -261,11 +258,8 @@ int macb_miiphy_write(struct mii_dev *bus, int phy_adr, int devad, int reg,
struct macb_device *macb = to_macb(dev);
#endif
- if (macb->phy_addr != phy_adr)
- return -1;
-
arch_get_mdio_control(bus->name);
- macb_mdio_write(macb, macb->phy_addr, reg, value);
+ macb_mdio_write(macb, phy_adr, reg, value);
return 0;
}