| Message ID | 1650452590-32948-3-git-send-email-radhey.shyam.pandey@xilinx.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 29e96fe9e0ec0f0fe1dd306a4ccb7b8983eae67a |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: macb: Make ZynqMP SGMII phy configuration optional | expand |
On 4/20/22 13:03, Radhey Shyam Pandey wrote: > In the macb binding documentation "phys" is an optional property. Make > implementation in line with it. This change allows the traditional flow > in which first stage bootloader does PS-GT configuration to work along > with newer use cases in which PS-GT configuration is managed by the > phy-zynqmp driver. > > It fixes below macb probe failure when macb DT node doesn't have SGMII > phys handle. > "macb ff0b0000.ethernet: error -ENODEV: failed to get PS-GTR PHY" > > Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> > --- > drivers/net/ethernet/cadence/macb_main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index a5140d4d3baf..6434e74c04f1 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -4588,7 +4588,7 @@ static int zynqmp_init(struct platform_device *pdev) > > if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII) { > /* Ensure PS-GTR PHY device used in SGMII mode is ready */ > - bp->sgmii_phy = devm_phy_get(&pdev->dev, "sgmii-phy"); > + bp->sgmii_phy = devm_phy_optional_get(&pdev->dev, NULL); > > if (IS_ERR(bp->sgmii_phy)) { > ret = PTR_ERR(bp->sgmii_phy); Reviewed-by: Michal Simek <michal.simek@xilinx.com> Thanks, Michal
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index a5140d4d3baf..6434e74c04f1 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4588,7 +4588,7 @@ static int zynqmp_init(struct platform_device *pdev) if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII) { /* Ensure PS-GTR PHY device used in SGMII mode is ready */ - bp->sgmii_phy = devm_phy_get(&pdev->dev, "sgmii-phy"); + bp->sgmii_phy = devm_phy_optional_get(&pdev->dev, NULL); if (IS_ERR(bp->sgmii_phy)) { ret = PTR_ERR(bp->sgmii_phy);
In the macb binding documentation "phys" is an optional property. Make implementation in line with it. This change allows the traditional flow in which first stage bootloader does PS-GT configuration to work along with newer use cases in which PS-GT configuration is managed by the phy-zynqmp driver. It fixes below macb probe failure when macb DT node doesn't have SGMII phys handle. "macb ff0b0000.ethernet: error -ENODEV: failed to get PS-GTR PHY" Signed-off-by: Radhey Shyam Pandey <radhey.shyam.pandey@xilinx.com> --- drivers/net/ethernet/cadence/macb_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)