net: zynq_gem: Add support for fixed-link phy
authorMichal Simek <michal.simek@xilinx.com>
Thu, 20 Sep 2018 07:42:27 +0000 (09:42 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 27 Sep 2018 05:59:26 +0000 (07:59 +0200)
Based on dt-specs fixed-link doesn't require phy-handle to be used.
Fix driver to only read phy related setting when phy-handle is found.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
drivers/net/zynq_gem.c

index d5c3fbe75a0666e4d2db9086b38a56abdeea6bc7..e22d048e8f081e0d2702e55f4ab065a7b1a79f1e 100644 (file)
@@ -699,14 +699,17 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
        /* Hardcode for now */
        priv->phyaddr = -1;
 
-       if (dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0,
-                                      &phandle_args)) {
-               debug("phy-handle does not exist %s\n", dev->name);
-               return -ENOENT;
+       if (!dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0,
+                                       &phandle_args)) {
+               debug("phy-handle does exist %s\n", dev->name);
+               priv->phyaddr = ofnode_read_u32_default(phandle_args.node,
+                                                       "reg", -1);
+               priv->phy_of_node = phandle_args.node;
+               priv->max_speed = ofnode_read_u32_default(phandle_args.node,
+                                                         "max-speed",
+                                                         SPEED_1000);
        }
 
-       priv->phyaddr = ofnode_read_u32_default(phandle_args.node, "reg", -1);
-       priv->phy_of_node = phandle_args.node;
        phy_mode = dev_read_prop(dev, "phy-mode", NULL);
        if (phy_mode)
                pdata->phy_interface = phy_get_interface_by_name(phy_mode);
@@ -716,8 +719,6 @@ static int zynq_gem_ofdata_to_platdata(struct udevice *dev)
        }
        priv->interface = pdata->phy_interface;
 
-       priv->max_speed = ofnode_read_u32_default(phandle_args.node,
-                                                 "max-speed", SPEED_1000);
        priv->int_pcs = dev_read_bool(dev, "is-internal-pcspma");
 
        printf("ZYNQ GEM: %lx, phyaddr %x, interface %s\n", (ulong)priv->iobase,