[PATCH 07/14] net: axienet: Support phy-less mode of operation

[Michal Simek]

From: Srikanth Thokala <srikanth.thok...@xilinx.com>

This patch adds proper checks to handle the PHY-less case.

Signed-off-by: Srikanth Thokala <stho...@xilinx.com>
Signed-off-by: Michal Simek <michal.si...@xilinx.com>
---

 drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c 
b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index 9595403..9cc9e59 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -940,11 +940,10 @@ static int axienet_open(struct net_device *ndev)
                                             PHY_INTERFACE_MODE_RGMII_ID);
                }

-               if (!lp->phy_dev) {
+               if (!lp->phy_dev)
                        dev_err(lp->dev, "of_phy_connect() failed\n");
-                       return -ENODEV;
-               }
-               phy_start(lp->phy_dev);
+               else
+                       phy_start(lp->phy_dev);
        }

        /* Enable tasklets for Axi DMA error handling */
@@ -1609,7 +1608,8 @@ static int axienet_of_probe(struct platform_device *op)
        lp->coalesce_count_tx = XAXIDMA_DFT_TX_THRESHOLD;

        lp->phy_node = of_parse_phandle(op->dev.of_node, "phy-handle", 0);
-       ret = axienet_mdio_setup(lp, op->dev.of_node);
+       if (lp->phy_node)
+               ret = axienet_mdio_setup(lp, op->dev.of_node);
        if (ret)
                dev_warn(&op->dev, "error registering MDIO bus\n");

--
1.8.2.3

pgpGP2GZoUY6s.pgp
Description: PGP signature