diff options
| author | Srikanth Thokala <srikanth.thokala@xilinx.com> | 2015-05-05 11:25:58 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-06 01:33:58 +0200 |
| commit | d7cc3163e026300f37a64d9e2fe5ad64a87504bc (patch) | |
| tree | baacb74559ecadf5fac7f26129dc04a3f9d399fe /drivers | |
| parent | net: axienet: Handle jumbo frames for lesser frame sizes (diff) | |
| download | linux-d7cc3163e026300f37a64d9e2fe5ad64a87504bc.tar.xz linux-d7cc3163e026300f37a64d9e2fe5ad64a87504bc.zip | |
net: axienet: Support phy-less mode of operation
This patch adds proper checks to handle the PHY-less case.
Signed-off-by: Srikanth Thokala <sthokal@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 10 |
1 files 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 b1081e1893b0..c6f2ba056c26 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 */ @@ -1606,7 +1605,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"); |