hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

phy: micrel: Fix finding PHY properties in MAC node. 

commit 8b63ec1837 ("phylib: Make PHYs children of their MDIO bus,
not the bus' parent.")  changed the parenting of PHY devices, making
them a child of the MDIO bus, instead of the MAC device. This broken
the Micrel PHY driver which has a deprecated feature of allowing PHY
properties to be placed into the MAC node.

In order to find the MAC node, we need to walk up the tree of devices
until we find one with an OF node attached.

Reported-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Suggested-by: David Daney <david.daney@cavium.com>
Acked-by: David Daney <david.daney@cavium.com>
Fixes: 8b63ec1837 ("phylib: Make PHYs children of their MDIO bus, not the bus' parent.")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2015-12-09 19:56:31 +01:00 committed by David S. Miller
parent 9470e24f35
commit 651df21835
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/phy/micrel.c
View File

@ -339,9 +339,18 @@ static int ksz9021_config_init(struct phy_device *phydev)
{ {
const struct device *dev = &phydev->dev; const struct device *dev = &phydev->dev;
const struct device_node *of_node = dev->of_node; const struct device_node *of_node = dev->of_node;
const struct device *dev_walker;
if (!of_node && dev->parent->of_node) /* The Micrel driver has a deprecated option to place phy OF
of_node = dev->parent->of_node; * properties in the MAC node. Walk up the tree of devices to
* find a device with an OF node.
*/
dev_walker = &phydev->dev;
do {
of_node = dev_walker->of_node;
dev_walker = dev_walker->parent;
} while (!of_node && dev_walker);
if (of_node) { if (of_node) {
ksz9021_load_values_from_of(phydev, of_node, ksz9021_load_values_from_of(phydev, of_node,