of: phy: Only register a phy device for phys

We will soon support devices other than phys on the mdio bus. Look at
a child's compatibility string to determine if it is a phy, before
registering a phy device.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index bc9d763..c029205 100644 (file)
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -114,6 +114,35 @@ int of_mdio_parse_addr(struct device *dev, const struct device_node *np)
 }
 EXPORT_SYMBOL(of_mdio_parse_addr);
 
+/*
+ * Return true if the child node is for a phy. It must either:
+ * o Compatible string of "ethernet-phy-idX.X"
+ * o Compatible string of "ethernet-phy-ieee802.3-c45"
+ * o Compatible string of "ethernet-phy-ieee802.3-c22"
+ * o No compatibility string
+ *
+ * A device which is not a phy is expected to have a compatible string
+ * indicating what sort of device it is.
+ */
+static bool of_mdiobus_child_is_phy(struct device_node *child)
+{
+       u32 phy_id;
+
+       if (of_get_phy_id(child, &phy_id) != -EINVAL)
+               return true;
+
+       if (of_device_is_compatible(child, "ethernet-phy-ieee802.3-c45"))
+               return true;
+
+       if (of_device_is_compatible(child, "ethernet-phy-ieee802.3-c22"))
+               return true;
+
+       if (!of_find_property(child, "compatible", NULL))
+               return true;
+
+       return false;
+}
+
 /**
  * of_mdiobus_register - Register mii_bus and create PHYs from the device tree
  * @mdio: pointer to mii_bus structure
@@ -140,7 +169,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
        if (rc)
                return rc;
 
-       /* Loop over the child nodes and register a phy_device for each one */
+       /* Loop over the child nodes and register a phy_device for each phy */
        for_each_available_child_of_node(np, child) {
                addr = of_mdio_parse_addr(&mdio->dev, child);
                if (addr < 0) {
@@ -148,9 +177,8 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                        continue;
                }
 
-               rc = of_mdiobus_register_phy(mdio, child, addr);
-               if (rc)
-                       continue;
+               if (of_mdiobus_child_is_phy(child))
+                       of_mdiobus_register_phy(mdio, child, addr);
        }
 
        if (!scanphys)
@@ -172,9 +200,8 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                        dev_info(&mdio->dev, "scan phy %s at address %i\n",
                                 child->name, addr);
 
-                       rc = of_mdiobus_register_phy(mdio, child, addr);
-                       if (rc)
-                               continue;
+                       if (of_mdiobus_child_is_phy(child))
+                               of_mdiobus_register_phy(mdio, child, addr);
                }
        }