From 9cbfe615f9a0784dc1186a9cc117bc40111d0db9 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 21 May 2014 11:53:28 +0200 Subject: [PATCH] net: phy: Support finding a phy in the devicetree When the ethernet device has a device_node then try finding the associated phy via the phy-handle property. This makes the phy handling via devicetree transparent to the ethernet drivers. Signed-off-by: Sascha Hauer --- drivers/net/phy/phy.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 1e26e455f..257df7437 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -262,6 +262,29 @@ int phy_register_device(struct phy_device* dev) return ret; } +static struct phy_device *of_mdio_find_phy(struct eth_device *edev) +{ + struct device_d *dev; + struct device_node *phy_node; + + if (!IS_ENABLED(CONFIG_OFDEVICE)) + return NULL; + + if (!edev->parent->device_node) + return NULL; + + phy_node = of_parse_phandle(edev->parent->device_node, "phy-handle", 0); + if (!phy_node) + return NULL; + + bus_for_each_device(&mdio_bus_type, dev) { + if (dev->device_node == phy_node) + return container_of(dev, struct phy_device, dev); + } + + return NULL; +} + static int phy_device_attach(struct phy_device *phy, struct eth_device *edev, void (*adjust_link) (struct eth_device *edev), u32 flags, phy_interface_t interface) @@ -312,6 +335,13 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr, return 0; } + phy = of_mdio_find_phy(edev); + if (phy) { + ret = phy_device_attach(phy, edev, adjust_link, flags, interface); + + goto out; + } + if (addr >= 0) { phy = mdiobus_scan(bus, addr); if (IS_ERR(phy)) {