Skip to content

Commit

Permalink
net: axienet: Support phy-less mode of operation
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Srikanth Thokala authored and David S. Miller committed May 5, 2015
1 parent f080a8c commit d7cc316
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/ethernet/xilinx/xilinx_axienet_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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");

Expand Down

0 comments on commit d7cc316

Please sign in to comment.