Skip to contentSkip to conversation

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

PATCH New Grygorii Strashko 3 participants 11 messages Aug 31, 2019 – Nov 4, 2019 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

cover arm: dts: ti: sync cpsw/mdio/phy with latest linux 1 - drop phy_id

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

Grygorii Strashko (3):
arm: dts: dra7: sync cpsw/mdio/phy with latest linux - drop phy_id
arm: dts: am437x: sync cpsw/mdio/phy with latest linux - drop phy_id
arm: dts: am335x: sync cpsw/mdio/phy with latest linux - drop phy_id

 arch/arm/dts/am335x-baltos.dts       | 14 ++++++++++++--
 arch/arm/dts/am335x-bone-common.dtsi | 12 ++++++------
 arch/arm/dts/am335x-brsmarc1.dts     | 12 ++++++++++--
 arch/arm/dts/am335x-brxre1.dts       | 12 ++++++++++--
 arch/arm/dts/am335x-chiliboard.dts   |  6 +++++-
 arch/arm/dts/am335x-draco.dts        |  2 +-
 arch/arm/dts/am335x-evm.dts          | 14 +++++++-------
 arch/arm/dts/am335x-evmsk.dts        | 16 ++++++++++++----
 arch/arm/dts/am335x-icev2.dts        | 12 ++++++++++--
 arch/arm/dts/am335x-igep0033.dtsi    | 12 ++++++++++--
 arch/arm/dts/am335x-pxm2.dtsi        | 12 ++++++++++--
 arch/arm/dts/am335x-rut.dts          |  7 +------
 arch/arm/dts/am335x-shc.dts          | 10 +++++-----
 arch/arm/dts/am335x-sl50.dts         | 13 +++++++------
 arch/arm/dts/am437x-gp-evm.dts       |  6 +++++-
 arch/arm/dts/am437x-idk-evm.dts      |  7 ++++++-
 arch/arm/dts/am437x-sk-evm.dts       | 12 ++++++++++--
 arch/arm/dts/am43x-epos-evm.dts      | 12 ++++++------
 arch/arm/dts/am57xx-idk-common.dtsi  | 14 ++++++++++++--
 arch/arm/dts/dra7-evm.dts            | 14 ++++++++++++--
 arch/arm/dts/dra71-evm.dts           |  4 ++--
 arch/arm/dts/dra72-evm-revc.dts      |  4 ++--
 arch/arm/dts/dra72-evm.dts           |  8 +++++++-
 arch/arm/dts/dra76-evm.dts           |  4 ++--
 24 files changed, 170 insertions(+), 69 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 arm: dts: dra7: 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.

---
 arch/arm/dts/am57xx-idk-common.dtsi | 14 ++++++++++++--
 arch/arm/dts/dra7-evm.dts           | 14 ++++++++++++--
 arch/arm/dts/dra71-evm.dts          |  4 ++--
 arch/arm/dts/dra72-evm-revc.dts     |  4 ++--
 arch/arm/dts/dra72-evm.dts          |  8 +++++++-
 arch/arm/dts/dra76-evm.dts          |  4 ++--
 6 files changed, 37 insertions(+), 11 deletions(-)
arch/arm/dts/am57xx-idk-common.dtsi +12 -2
index fdb4e0e47c..590fb14caf 100644
@@ -372,17 +372,27 @@
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <0>;
+	phy-handle = <&ethphy0>;
 	phy-mode = "rgmii";
 	dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <1>;
+	phy-handle = <&ethphy1>;
 	phy-mode = "rgmii";
 	dual_emac_res_vlan = <2>;
 };
 
+&davinci_mdio {
+	ethphy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
+
+	ethphy1: ethernet-phy at 1 {
+		reg = <1>;
+	};
+};
+
 &usb2_phy1 {
 	phy-supply = <&ldousb_reg>;
 };
arch/arm/dts/dra7-evm.dts +12 -2
index aa426dabb6..43de9638e3 100644
@@ -479,17 +479,27 @@
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <2>;
+	phy-handle = <&ethphy0>;
 	phy-mode = "rgmii";
 	dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <3>;
+	phy-handle = <&ethphy1>;
 	phy-mode = "rgmii";
 	dual_emac_res_vlan = <2>;
 };
 
+&davinci_mdio {
+	ethphy0: ethernet-phy at 2 {
+		reg = <2>;
+	};
+
+	ethphy1: ethernet-phy at 3 {
+		reg = <3>;
+	};
+};
+
 &dcan1 {
 	status = "ok";
 	pinctrl-names = "default", "sleep", "active";
arch/arm/dts/dra71-evm.dts +2 -2
index 64363f75c0..9bf08294b2 100644
@@ -201,13 +201,13 @@
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <2>;
+	phy-handle = <&dp83867_0>;
 	phy-mode = "rgmii-id";
 	dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <3>;
+	phy-handle = <&dp83867_1>;
 	phy-mode = "rgmii-id";
 	dual_emac_res_vlan = <2>;
 };
arch/arm/dts/dra72-evm-revc.dts +2 -2
index bf588d0072..fafc2a4d7b 100644
@@ -61,13 +61,13 @@
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <2>;
+	phy-handle = <&dp83867_0>;
 	phy-mode = "rgmii-id";
 	dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <3>;
+	phy-handle = <&dp83867_1>;
 	phy-mode = "rgmii-id";
 	dual_emac_res_vlan = <2>;
 };
arch/arm/dts/dra72-evm.dts +7 -1
index c572693b16..154b0a0ceb 100644
@@ -51,10 +51,16 @@
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <3>;
+	phy-handle = <&ethphy0>;
 	phy-mode = "rgmii";
 };
 
+&davinci_mdio {
+	ethphy0: ethernet-phy at 3 {
+		reg = <3>;
+	};
+};
+
 &mmc1 {
 	pinctrl-names = "default", "hs", "sdr12", "sdr25", "sdr50", "ddr50", "sdr104";
 	pinctrl-0 = <&mmc1_pins_default>;
arch/arm/dts/dra76-evm.dts +2 -2
index a1f289f345..e3da17ac97 100644
@@ -341,13 +341,13 @@
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <2>;
+	phy-handle = <&dp83867_0>;
 	phy-mode = "rgmii-id";
 	dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <3>;
+	phy-handle = <&dp83867_1>;
 	phy-mode = "rgmii-id";
 	dual_emac_res_vlan = <2>;
 };
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/3 arm: dts: dra7: sync cpsw/mdio/phy with latest linux - drop phy_id

Quoted 5 lines · Grygorii Strashko

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

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191104/81120738/attachment.sig>
#3 lore raw

PATCH 2/3 arm: dts: am437x: sync cpsw/mdio/phy with latest linux - drop phy_id

In reply to Grygorii Strashko

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

---
 arch/arm/dts/am437x-gp-evm.dts  |  6 +++++-
 arch/arm/dts/am437x-idk-evm.dts |  7 ++++++-
 arch/arm/dts/am437x-sk-evm.dts  | 12 ++++++++++--
 arch/arm/dts/am43x-epos-evm.dts | 12 ++++++------
 4 files changed, 27 insertions(+), 10 deletions(-)
arch/arm/dts/am437x-gp-evm.dts +5 -1
index 142bfc52a1..3c500d52db 100644
@@ -645,10 +645,14 @@
 	pinctrl-0 = <&davinci_mdio_default>;
 	pinctrl-1 = <&davinci_mdio_sleep>;
 	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <0>;
+	phy-handle = <&ethphy0>;
 	phy-mode = "rgmii";
 };
 
arch/arm/dts/am437x-idk-evm.dts +6 -1
index 19d1462d15..8f6824c198 100644
@@ -385,6 +385,7 @@
 };
 
 &mac {
+	slaves = <1>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&cpsw_default>;
 	pinctrl-1 = <&cpsw_sleep>;
@@ -396,10 +397,14 @@
 	pinctrl-0 = <&davinci_mdio_default>;
 	pinctrl-1 = <&davinci_mdio_sleep>;
 	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <0>;
+	phy-handle = <&ethphy0>;
 	phy-mode = "rgmii";
 };
 
arch/arm/dts/am437x-sk-evm.dts +10 -2
index dc8fcde458..66a3bd1dfa 100644
@@ -626,16 +626,24 @@
 	pinctrl-0 = <&davinci_mdio_default>;
 	pinctrl-1 = <&davinci_mdio_sleep>;
 	status = "okay";
+
+	ethphy0: ethernet-phy at 4 {
+		reg = <4>;
+	};
+
+	ethphy1: ethernet-phy at 5 {
+		reg = <5>;
+	};
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <4>;
+	phy-handle = <&ethphy0>;
 	phy-mode = "rgmii";
 	dual_emac_res_vlan = <1>;
 };
 
 &cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <5>;
+	phy-handle = <&ethphy1>;
 	phy-mode = "rgmii";
 	dual_emac_res_vlan = <2>;
 };
arch/arm/dts/am43x-epos-evm.dts +6 -6
index fa4d1e3f32..65f157ed59 100644
@@ -389,6 +389,7 @@
 	pinctrl-0 = <&cpsw_default>;
 	pinctrl-1 = <&cpsw_sleep>;
 	status = "okay";
+	slaves = <1>;
 };
 
 &davinci_mdio {
@@ -396,15 +397,14 @@
 	pinctrl-0 = <&davinci_mdio_default>;
 	pinctrl-1 = <&davinci_mdio_sleep>;
 	status = "okay";
-};
 
-&cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <16>;
-	phy-mode = "rmii";
+	ethphy0: ethernet-phy at 16 {
+		reg = <16>;
+	};
 };
 
-&cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <1>;
+&cpsw_emac0 {
+	phy-handle = <&ethphy0>;
 	phy-mode = "rmii";
 };
 
Signature · 1 line
2.17.1
#4 lore raw

PATCH 2/3 arm: dts: am437x: sync cpsw/mdio/phy with latest linux - drop phy_id

Quoted 5 lines · Grygorii Strashko

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

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191104/b7b2bf20/attachment.sig>
#5 lore raw

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

In reply to Grygorii Strashko

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

Cc Lokesh Vutla <[email protected]>
Cc Hannes Schmelzer <[email protected]>
Cc Heiko Schocher <[email protected]>
Cc Felix Brack <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>
---
 arch/arm/dts/am335x-baltos.dts       | 14 ++++++++++++--
 arch/arm/dts/am335x-bone-common.dtsi | 12 ++++++------
 arch/arm/dts/am335x-brsmarc1.dts     | 12 ++++++++++--
 arch/arm/dts/am335x-brxre1.dts       | 12 ++++++++++--
 arch/arm/dts/am335x-chiliboard.dts   |  6 +++++-
 arch/arm/dts/am335x-draco.dts        |  2 +-
 arch/arm/dts/am335x-evm.dts          | 14 +++++++-------
 arch/arm/dts/am335x-evmsk.dts        | 16 ++++++++++++----
 arch/arm/dts/am335x-icev2.dts        | 12 ++++++++++--
 arch/arm/dts/am335x-igep0033.dtsi    | 12 ++++++++++--
 arch/arm/dts/am335x-pxm2.dtsi        | 12 ++++++++++--
 arch/arm/dts/am335x-rut.dts          |  7 +------
 arch/arm/dts/am335x-shc.dts          | 10 +++++-----
 arch/arm/dts/am335x-sl50.dts         | 13 +++++++------
 14 files changed, 106 insertions(+), 48 deletions(-)
arch/arm/dts/am335x-baltos.dts +12 -2
index f939cf6406..b3c13c9a9d 100644
@@ -409,16 +409,26 @@
 	pinctrl-1 = <&davinci_mdio_sleep>;
 
 	status = "okay";
+
+	phy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
+
+	phy1: ethernet-phy at 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>;
 };
arch/arm/dts/am335x-bone-common.dtsi +6 -6
index 40a3c35ff8..5b8230e281 100644
@@ -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 at 0 {
+		reg = <0>;
+	};
 };
 
 &mmc1 {
arch/arm/dts/am335x-brsmarc1.dts +10 -2
index 1a7f9a5365..e1738b6dde 100644
@@ -247,6 +247,14 @@
 
 &davinci_mdio {
 	status = "okay";
+
+	ethphy0: ethernet-phy at 1 {
+		reg = <1>;
+	};
+
+	ethphy1: ethernet-phy at 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>;
 };
arch/arm/dts/am335x-brxre1.dts +10 -2
index 708407daf2..a0d046d07a 100644
@@ -206,6 +206,14 @@
 
 &davinci_mdio {
 	status = "okay";
+
+	ethphy0: ethernet-phy at 1 {
+		reg = <1>;
+	};
+
+	ethphy1: ethernet-phy at 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";
 };
 
arch/arm/dts/am335x-chiliboard.dts +5 -1
index 59431b2359..9c2a947aac 100644
@@ -140,10 +140,14 @@
 	pinctrl-0 = <&davinci_mdio_default>;
 	pinctrl-1 = <&davinci_mdio_sleep>;
 	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
 };
 
 &cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <0>;
+	phy-handle = <&ethphy0>;
 	phy-mode = "rmii";
 };
 
arch/arm/dts/am335x-draco.dts +1 -1
index 25d0480ecd..f8faa8f7c4 100644
@@ -143,7 +143,7 @@
 };
 
 &cpsw_emac0 {
-	phy_id = <&mdio0>, <0>;
+	phy-handle = <&phy0>;
 	phy-mode = "rmii";
 };
 
arch/arm/dts/am335x-evm.dts +7 -7
index fe27207588..0bda4d4429 100644
@@ -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 at 0 {
+		reg = <0>;
+	};
 };
 
-&cpsw_emac1 {
-	phy_id = <&davinci_mdio>, <1>;
-	phy-mode = "rgmii-txid";
+&cpsw_emac0 {
+	phy-handle = <&ethphy0>;
+	phy-mode = "rgmii-id";
 };
 
 &tscadc {
arch/arm/dts/am335x-evmsk.dts +12 -4
index 0767578aee..5762967cf7 100644
@@ -630,17 +630,25 @@
 	pinctrl-0 = <&davinci_mdio_default>;
 	pinctrl-1 = <&davinci_mdio_sleep>;
 	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
+
+	ethphy1: ethernet-phy at 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>;
 };
 
arch/arm/dts/am335x-icev2.dts +10 -2
index debc6f6132..37484cb6f5 100644
@@ -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 at 1 {
+		reg = <1>;
+	};
+
+	ethphy1: ethernet-phy at 3 {
+		reg = <3>;
+	};
 };
arch/arm/dts/am335x-igep0033.dtsi +10 -2
index a5769a8f5f..f102f6adad 100644
@@ -102,15 +102,23 @@
 
 &davinci_mdio {
 	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		reg = <0>;
+	};
+
+	ethphy1: ethernet-phy at 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";
 };
 
arch/arm/dts/am335x-pxm2.dtsi +10 -2
index d9243d5d3d..19bd7e2420 100644
@@ -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 at 0 {
+		reg = <0>;
+	};
+
+	ethphy1: ethernet-phy at 1 {
+		reg = <1>;
+	};
 };
 
 &elm {
arch/arm/dts/am335x-rut.dts +1 -6
index a5716a929f..145247344f 100644
@@ -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 {
arch/arm/dts/am335x-shc.dts +5 -5
index 5cdd309b90..8e35c439e5 100644
@@ -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 at 4a100200  {
-		phy_id = <&davinci_mdio>, <0>;
-		phy-mode = "mii";
-		phy-handle = <&ethernetphy0>;
-	};
 };
 
 &mmc1 {
arch/arm/dts/am335x-sl50.dts +7 -6
index 1bcc60424e..ebb56bdaad 100644
@@ -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 at 0 {
+		reg = <0>;
+	};
 };
 
 &sham {
Signature · 1 line
2.17.1
#6 lore raw

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

Quoted 9 lines · Grygorii Strashko

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

Cc Lokesh Vutla <[email protected]>
Cc Hannes Schmelzer <[email protected]>
Cc Heiko Schocher <[email protected]>
Cc Felix Brack <[email protected]>
Cc Jean-Jacques Hiblot <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191104/b8366ef6/attachment.sig>
#7 lore raw

cover arm: dts: ti: sync cpsw/mdio/phy with latest linux 1 - drop phy_id

In reply to Grygorii Strashko
Quoted 2 lines · Grygorii Strashko

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

For the series:

Thanks and regards,
Lokesh

Quoted 32 lines

Grygorii Strashko (3):
arm: dts: dra7: sync cpsw/mdio/phy with latest linux - drop phy_id
arm: dts: am437x: sync cpsw/mdio/phy with latest linux - drop phy_id
arm: dts: am335x: sync cpsw/mdio/phy with latest linux - drop phy_id

 arch/arm/dts/am335x-baltos.dts       | 14 ++++++++++++--
 arch/arm/dts/am335x-bone-common.dtsi | 12 ++++++------
 arch/arm/dts/am335x-brsmarc1.dts     | 12 ++++++++++--
 arch/arm/dts/am335x-brxre1.dts       | 12 ++++++++++--
 arch/arm/dts/am335x-chiliboard.dts   |  6 +++++-
 arch/arm/dts/am335x-draco.dts        |  2 +-
 arch/arm/dts/am335x-evm.dts          | 14 +++++++-------
 arch/arm/dts/am335x-evmsk.dts        | 16 ++++++++++++----
 arch/arm/dts/am335x-icev2.dts        | 12 ++++++++++--
 arch/arm/dts/am335x-igep0033.dtsi    | 12 ++++++++++--
 arch/arm/dts/am335x-pxm2.dtsi        | 12 ++++++++++--
 arch/arm/dts/am335x-rut.dts          |  7 +------
 arch/arm/dts/am335x-shc.dts          | 10 +++++-----
 arch/arm/dts/am335x-sl50.dts         | 13 +++++++------
 arch/arm/dts/am437x-gp-evm.dts       |  6 +++++-
 arch/arm/dts/am437x-idk-evm.dts      |  7 ++++++-
 arch/arm/dts/am437x-sk-evm.dts       | 12 ++++++++++--
 arch/arm/dts/am43x-epos-evm.dts      | 12 ++++++------
 arch/arm/dts/am57xx-idk-common.dtsi  | 14 ++++++++++++--
 arch/arm/dts/dra7-evm.dts            | 14 ++++++++++++--
 arch/arm/dts/dra71-evm.dts           |  4 ++--
 arch/arm/dts/dra72-evm-revc.dts      |  4 ++--
 arch/arm/dts/dra72-evm.dts           |  8 +++++++-
 arch/arm/dts/dra76-evm.dts           |  4 ++--
 24 files changed, 170 insertions(+), 69 deletions(-)
#8 lore raw

cover arm: dts: ti: sync cpsw/mdio/phy with latest linux 1 - drop phy_id

Hi Tom, All,

Quoted 9 lines · Lokesh Vutla
Quoted 2 lines · Grygorii Strashko

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

For the series:

Are there anything else I need to do to have this merged? Sry, for impatience.

Signature · 2 lines
Best regards,
grygorii
#9 lore raw

cover arm: dts: ti: sync cpsw/mdio/phy with latest linux 1 - drop phy_id

In reply to Lokesh Vutla

Tom,

Quoted 8 lines · Lokesh Vutla
Quoted 2 lines · Grygorii Strashko

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

For the series:

It's been there for long time and no further comments are expected. Do you mind pulling these for rc2?

Thanks and regards,
Lokesh

Quoted 36 lines

Thanks and regards,
Lokesh

Quoted 32 lines

Grygorii Strashko (3):
arm: dts: dra7: sync cpsw/mdio/phy with latest linux - drop phy_id
arm: dts: am437x: sync cpsw/mdio/phy with latest linux - drop phy_id
arm: dts: am335x: sync cpsw/mdio/phy with latest linux - drop phy_id

 arch/arm/dts/am335x-baltos.dts       | 14 ++++++++++++--
 arch/arm/dts/am335x-bone-common.dtsi | 12 ++++++------
 arch/arm/dts/am335x-brsmarc1.dts     | 12 ++++++++++--
 arch/arm/dts/am335x-brxre1.dts       | 12 ++++++++++--
 arch/arm/dts/am335x-chiliboard.dts   |  6 +++++-
 arch/arm/dts/am335x-draco.dts        |  2 +-
 arch/arm/dts/am335x-evm.dts          | 14 +++++++-------
 arch/arm/dts/am335x-evmsk.dts        | 16 ++++++++++++----
 arch/arm/dts/am335x-icev2.dts        | 12 ++++++++++--
 arch/arm/dts/am335x-igep0033.dtsi    | 12 ++++++++++--
 arch/arm/dts/am335x-pxm2.dtsi        | 12 ++++++++++--
 arch/arm/dts/am335x-rut.dts          |  7 +------
 arch/arm/dts/am335x-shc.dts          | 10 +++++-----
 arch/arm/dts/am335x-sl50.dts         | 13 +++++++------
 arch/arm/dts/am437x-gp-evm.dts       |  6 +++++-
 arch/arm/dts/am437x-idk-evm.dts      |  7 ++++++-
 arch/arm/dts/am437x-sk-evm.dts       | 12 ++++++++++--
 arch/arm/dts/am43x-epos-evm.dts      | 12 ++++++------
 arch/arm/dts/am57xx-idk-common.dtsi  | 14 ++++++++++++--
 arch/arm/dts/dra7-evm.dts            | 14 ++++++++++++--
 arch/arm/dts/dra71-evm.dts           |  4 ++--
 arch/arm/dts/dra72-evm-revc.dts      |  4 ++--
 arch/arm/dts/dra72-evm.dts           |  8 +++++++-
 arch/arm/dts/dra76-evm.dts           |  4 ++--
 24 files changed, 170 insertions(+), 69 deletions(-)
#10 lore raw

cover arm: dts: ti: sync cpsw/mdio/phy with latest linux 1 - drop phy_id

Quoted 6 lines · Lokesh Vutla

Tom,

Quoted 3 lines · Lokesh Vutla

On 31/08/19 1:00 PM, Grygorii Strashko wrote:

Quoted 8 lines
Quoted 5 lines
Quoted 2 lines

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

For the series:

It's been there for long time and no further comments are expected. Do you mind pulling these for rc2?

On my list, thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20191101/887d77d6/attachment.sig>