Commit cb1e6bf4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'zynqmp-phy-config-optional' 



Radhey Shyam Pandey says:

====================
net: macb: Make ZynqMP SGMII phy configuration optional

This patchset drop phy-names property from MACB node and also make
SGMII Phy configuration optional. The motivation for this change
is to support traditional usescase in which first stage bootloader
does PS-GT configuration, and should still be supported in macb
driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 42d59435 29e96fe9

Documentation/devicetree/bindings/net/cdns,macb.yaml

+0 −8
Original line number Diff line number Diff line
@@ -84,13 +84,6 @@ properties: 
  phys:

    maxItems: 1



  phy-names:

    const: sgmii-phy

    description:

      Required with ZynqMP SoC when in SGMII mode.

      Should reference PS-GTR generic PHY device for this controller

      instance. See ZynqMP example.



  resets:

    maxItems: 1

    description:
@@ -204,7 +197,6 @@ examples: 
                    reset-names = "gem1_rst";

                    status = "okay";

                    phy-mode = "sgmii";

                    phy-names = "sgmii-phy";

                    phys = <&psgtr 1 PHY_TYPE_SGMII 1 1>;

                    fixed-link {

                            speed = <1000>;

drivers/net/ethernet/cadence/macb_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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);