arm: dts: am335x: sync cpsw/mdio/phy with latest linux - drop phy_id

Synchronize CPSW/MDIO/PHY DT nodes with latest linux - replace deprecated
phy_id property with phy-handle.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Felix Brack <fb@ltec.ch>
Cc: Jean-Jacques Hiblot <jjhiblot@ti.com>

diff --git a/arch/arm/dts/am335x-baltos.dts b/arch/arm/dts/am335x-baltos.dts
index f939cf6406cb257b3172072eb9dd4ed82aa5bdfb..b3c13c9a9d17b0cc8bc1989fc37762510928f1a8 100644 (file)
--- a/arch/arm/dts/am335x-baltos.dts
+++ b/arch/arm/dts/am335x-baltos.dts
@@ -409,16 +409,26 @@
        pinctrl-1 = <&davinci_mdio_sleep>;
 
        status = "okay";
+
+       phy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+
+       phy1: ethernet-phy@7 {
+               reg = <7>;
+               eee-broken-100tx;
+               eee-broken-1000t;
+       };
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <0>;
+       phy-handle = <&phy0>;
        phy-mode = "rmii";
        dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <7>;
+       phy-handle = <&phy1>;
        phy-mode = "rgmii-txid";
        dual_emac_res_vlan = <2>;
 };

diff --git a/arch/arm/dts/am335x-bone-common.dtsi b/arch/arm/dts/am335x-bone-common.dtsi
index 40a3c35ff8d7f636f1035648e328c88aed20afb4..5b8230e28152e9d6e8308c398bd0eed6e06132d3 100644 (file)
--- a/arch/arm/dts/am335x-bone-common.dtsi
+++ b/arch/arm/dts/am335x-bone-common.dtsi
@@ -360,16 +360,12 @@
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <0>;
-       phy-mode = "mii";
-};
-
-&cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <1>;
+       phy-handle = <&ethphy0>;
        phy-mode = "mii";
 };
 
 &mac {
+       slaves = <1>;
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
@@ -381,6 +377,10 @@
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
        status = "okay";
+
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
 };
 
 &mmc1 {

diff --git a/arch/arm/dts/am335x-brsmarc1.dts b/arch/arm/dts/am335x-brsmarc1.dts
index 1a7f9a5365d1182ed2bf5c3e8c14d6cdbcb85c66..e1738b6dde3fa8af1bb76ca8635bc8e9135d07b0 100644 (file)
--- a/arch/arm/dts/am335x-brsmarc1.dts
+++ b/arch/arm/dts/am335x-brsmarc1.dts
@@ -247,6 +247,14 @@
 
 &davinci_mdio {
        status = "okay";
+
+       ethphy0: ethernet-phy@1 {
+               reg = <1>;
+       };
+
+       ethphy1: ethernet-phy@3 {
+               reg = <3>;
+       };
 };
 
 &mac {
@@ -258,13 +266,13 @@
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <1>;
+       phy-handle = <&ethphy0>;
        phy-mode = "rmii";
        ti,ledcr = <0x0480>;
 };
 
 &cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <3>;
+       phy-handle = <&ethphy1>;
        phy-mode = "rmii";
        ti,ledcr = <0x0480>;
 };

diff --git a/arch/arm/dts/am335x-brxre1.dts b/arch/arm/dts/am335x-brxre1.dts
index 708407daf2eb85435243e2e93c686e4ccdb2c078..a0d046d07a196dfc2cb03f60f6fa42e73e8eb9ac 100644 (file)
--- a/arch/arm/dts/am335x-brxre1.dts
+++ b/arch/arm/dts/am335x-brxre1.dts
@@ -206,6 +206,14 @@
 
 &davinci_mdio {
        status = "okay";
+
+       ethphy0: ethernet-phy@1 {
+               reg = <1>;
+       };
+
+       ethphy1: ethernet-phy@2 {
+               reg = <2>;
+       };
 };
 
 &mac {
@@ -213,12 +221,12 @@
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <1>;
+       phy-handle = <&ethphy0>;
        phy-mode = "mii";
 };
 
 &cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <2>;
+       phy-handle = <&ethphy1>;
        phy-mode = "mii";
 };
 

diff --git a/arch/arm/dts/am335x-chiliboard.dts b/arch/arm/dts/am335x-chiliboard.dts
index 59431b23594489dd3f211c0be1a93c031d3c0c46..9c2a947aacf5c7e54ddb9c36c4e78ec948fb3347 100644 (file)
--- a/arch/arm/dts/am335x-chiliboard.dts
+++ b/arch/arm/dts/am335x-chiliboard.dts
@@ -140,10 +140,14 @@
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
        status = "okay";
+
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <0>;
+       phy-handle = <&ethphy0>;
        phy-mode = "rmii";
 };
 

diff --git a/arch/arm/dts/am335x-draco.dts b/arch/arm/dts/am335x-draco.dts
index 25d0480ecd1a3937e88031c2f79694bbed5ac711..f8faa8f7c4fa280730eccb000ce066366efbdad2 100644 (file)
--- a/arch/arm/dts/am335x-draco.dts
+++ b/arch/arm/dts/am335x-draco.dts
@@ -143,7 +143,7 @@
 };
 
 &cpsw_emac0 {
-       phy_id = <&mdio0>, <0>;
+       phy-handle = <&phy0>;
        phy-mode = "rmii";
 };
 

diff --git a/arch/arm/dts/am335x-evm.dts b/arch/arm/dts/am335x-evm.dts
index fe272075887158965473d433e601f55516277e9d..0bda4d4429fee7f84cb1e866cf99a47333ff16fd 100644 (file)
--- a/arch/arm/dts/am335x-evm.dts
+++ b/arch/arm/dts/am335x-evm.dts
@@ -675,6 +675,7 @@
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
        status = "okay";
+       slaves = <1>;
 };
 
 &davinci_mdio {
@@ -682,16 +683,15 @@
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
        status = "okay";
-};
 
-&cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <0>;
-       phy-mode = "rgmii-txid";
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
 };
 
-&cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <1>;
-       phy-mode = "rgmii-txid";
+&cpsw_emac0 {
+       phy-handle = <&ethphy0>;
+       phy-mode = "rgmii-id";
 };
 
 &tscadc {

diff --git a/arch/arm/dts/am335x-evmsk.dts b/arch/arm/dts/am335x-evmsk.dts
index 0767578aeeb872ecd39053c6b5e1ba5d6deff172..5762967cf70aedf03ec5ba2285bf367af22491dc 100644 (file)
--- a/arch/arm/dts/am335x-evmsk.dts
+++ b/arch/arm/dts/am335x-evmsk.dts
@@ -630,17 +630,25 @@
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
        status = "okay";
+
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+
+       ethphy1: ethernet-phy@1 {
+               reg = <1>;
+       };
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <0>;
-       phy-mode = "rgmii-txid";
+       phy-handle = <&ethphy0>;
+       phy-mode = "rgmii-id";
        dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <1>;
-       phy-mode = "rgmii-txid";
+       phy-handle = <&ethphy1>;
+       phy-mode = "rgmii-id";
        dual_emac_res_vlan = <2>;
 };
 

diff --git a/arch/arm/dts/am335x-icev2.dts b/arch/arm/dts/am335x-icev2.dts
index debc6f6132ba200418c9e141ee179b2ab40ec714..37484cb6f56586b62f7881d726cf141e2427e1bf 100644 (file)
--- a/arch/arm/dts/am335x-icev2.dts
+++ b/arch/arm/dts/am335x-icev2.dts
@@ -397,13 +397,13 @@
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <1>;
+       phy-handle = <&ethphy0>;
        phy-mode = "rmii";
        dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <3>;
+       phy-handle = <&ethphy1>;
        phy-mode = "rmii";
        dual_emac_res_vlan = <2>;
 };
@@ -427,4 +427,12 @@
        status = "okay";
        reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
        reset-delay-us = <2>;   /* PHY datasheet states 1uS min */
+
+       ethphy0: ethernet-phy@1 {
+               reg = <1>;
+       };
+
+       ethphy1: ethernet-phy@3 {
+               reg = <3>;
+       };
 };

diff --git a/arch/arm/dts/am335x-igep0033.dtsi b/arch/arm/dts/am335x-igep0033.dtsi
index a5769a8f5fc81b001140ee08c2a379ed7db11613..f102f6adad972eb0eb549dc5b1c2da71c58ad96e 100644 (file)
--- a/arch/arm/dts/am335x-igep0033.dtsi
+++ b/arch/arm/dts/am335x-igep0033.dtsi
@@ -102,15 +102,23 @@
 
 &davinci_mdio {
        status = "okay";
+
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+
+       ethphy1: ethernet-phy@1 {
+               reg = <1>;
+       };
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <0>;
+       phy-handle = <&ethphy0>;
        phy-mode = "rmii";
 };
 
 &cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <1>;
+       phy-handle = <&ethphy1>;
        phy-mode = "rmii";
 };
 

diff --git a/arch/arm/dts/am335x-pxm2.dtsi b/arch/arm/dts/am335x-pxm2.dtsi
index d9243d5d3d96dc757eb001d5e801195971ea9d9e..19bd7e242055ce30af845a162fdf7971c8f14300 100644 (file)
--- a/arch/arm/dts/am335x-pxm2.dtsi
+++ b/arch/arm/dts/am335x-pxm2.dtsi
@@ -117,12 +117,12 @@
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <0>;
+       phy-handle = <&ethphy0>;
        phy-mode = "rgmii-txid";
 };
 
 &cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <1>;
+       phy-handle = <&ethphy1>;
        phy-mode = "rgmii-txid";
 };
 
@@ -131,6 +131,14 @@
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
        status = "okay";
+
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
+
+       ethphy1: ethernet-phy@1 {
+               reg = <1>;
+       };
 };
 
 &elm {

diff --git a/arch/arm/dts/am335x-rut.dts b/arch/arm/dts/am335x-rut.dts
index a5716a929f6683933f2cde0c3879a34da84748e4..145247344ffb37f816e05dd5816befd3f289c273 100644 (file)
--- a/arch/arm/dts/am335x-rut.dts
+++ b/arch/arm/dts/am335x-rut.dts
@@ -149,13 +149,8 @@
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <1>;
-       phy-mode = "rmii";
-};
-
-&cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <0>;
        phy-mode = "rmii";
+       phy-handle = <&ethernet_phy>;
 };
 
 &davinci_mdio {

diff --git a/arch/arm/dts/am335x-shc.dts b/arch/arm/dts/am335x-shc.dts
index 5cdd309b901161118b88de06e242077af62732d7..8e35c439e55f09c70f81cc4006ced60d0efc127d 100644 (file)
--- a/arch/arm/dts/am335x-shc.dts
+++ b/arch/arm/dts/am335x-shc.dts
@@ -197,17 +197,17 @@
        };
 };
 
+&cpsw_emac0 {
+       phy-mode = "mii";
+       phy-handle = <&ethernetphy0>;
+};
+
 &mac {
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&cpsw_default>;
        pinctrl-1 = <&cpsw_sleep>;
        status = "okay";
        slaves = <1>;
-       cpsw_emac0: slave@4a100200  {
-               phy_id = <&davinci_mdio>, <0>;
-               phy-mode = "mii";
-               phy-handle = <&ethernetphy0>;
-       };
 };
 
 &mmc1 {

diff --git a/arch/arm/dts/am335x-sl50.dts b/arch/arm/dts/am335x-sl50.dts
index 1bcc60424ecd1eeb7134e7eb973dfc64f3bb9edf..ebb56bdaade91f88d07e209dbfbf88d9e7f729e2 100644 (file)
--- a/arch/arm/dts/am335x-sl50.dts
+++ b/arch/arm/dts/am335x-sl50.dts
@@ -507,13 +507,8 @@
 };
 
 &cpsw_emac0 {
-       phy_id = <&davinci_mdio>, <0>;
-       phy-mode = "mii";
-};
-
-&cpsw_emac1 {
-       phy_id = <&davinci_mdio>, <1>;
        phy-mode = "mii";
+       phy-handle = <&ethphy0>;
 };
 
 &mac {
@@ -528,6 +523,12 @@
        pinctrl-names = "default", "sleep";
        pinctrl-0 = <&davinci_mdio_default>;
        pinctrl-1 = <&davinci_mdio_sleep>;
+       reset-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
+       reset-delay-us = <100>;   /* PHY datasheet states 100us min */
+
+       ethphy0: ethernet-phy@0 {
+               reg = <0>;
+       };
 };
 
 &sham {