Merge tag 'for-4.21/block-20190102' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / net / cpsw.txt

diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
index b3acebe08eb0a9d4e3d4ac315cd513e340c65f16..3264e1978d25fde513e8857b27348f9edc153203 100644 (file)
--- a/Documentation/devicetree/bindings/net/cpsw.txt
+++ b/Documentation/devicetree/bindings/net/cpsw.txt
@@ -22,7 +22,8 @@ Required properties:
 - cpsw-phy-sel         : Specifies the phandle to the CPSW phy mode selection
                          device. See also cpsw-phy-sel.txt for it's binding.
                          Note that in legacy cases cpsw-phy-sel may be
-                         a child device instead of a phandle.
+                         a child device instead of a phandle
+                         (DEPRECATED, use phys property instead).
 
 Optional properties:
 - ti,hwmods            : Must be "cpgmac0"
@@ -44,6 +45,7 @@ Optional properties:
 Slave Properties:
 Required properties:
 - phy-mode             : See ethernet.txt file in the same directory
+- phys                 : phandle on phy-gmii-sel PHY (see phy/ti-phy-gmii-sel.txt)
 
 Optional properties:
 - dual_emac_res_vlan   : Specifies VID to be used to segregate the ports
@@ -85,12 +87,14 @@ Examples:
                        phy-mode = "rgmii-txid";
                        /* Filled in by U-Boot */
                        mac-address = [ 00 00 00 00 00 00 ];
+                       phys = <&phy_gmii_sel 1 0>;
                };
                cpsw_emac1: slave@1 {
                        phy_id = <&davinci_mdio>, <1>;
                        phy-mode = "rgmii-txid";
                        /* Filled in by U-Boot */
                        mac-address = [ 00 00 00 00 00 00 ];
+                       phys = <&phy_gmii_sel 2 0>;
                };
        };
 
@@ -114,11 +118,13 @@ Examples:
                        phy-mode = "rgmii-txid";
                        /* Filled in by U-Boot */
                        mac-address = [ 00 00 00 00 00 00 ];
+                       phys = <&phy_gmii_sel 1 0>;
                };
                cpsw_emac1: slave@1 {
                        phy_id = <&davinci_mdio>, <1>;
                        phy-mode = "rgmii-txid";
                        /* Filled in by U-Boot */
                        mac-address = [ 00 00 00 00 00 00 ];
+                       phys = <&phy_gmii_sel 2 0>;
                };
        };