dts: am335x-brsmarc1/xre1: insert phy_id again

commit 3b3e8a3 ("arm: dts: am335x: sync cpsw/mdio/phy with latest linux - drop phy_id") did sync with recent linux kernel and replaced therefore the 'phy_id' property with a phy-handle pointing to the mdio. This is OK for linux, but introduces trouble with the already running vxWorks on this target. So this commit here re-inerts the phy_id property beside the phy-handle property to be compatible with both. Signed-off-by: Hannes Schmelzer <[email protected]>
apalos · Dec 13, 2019 · 0576770 · 0576770
1 parent f39abbb
commit 0576770
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/arch/arm/dts/am335x-brsmarc1.dts b/arch/arm/dts/am335x-brsmarc1.dts
@@ -266,12 +266,14 @@
 };
 
 &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
@@ -221,11 +221,13 @@
 };
 
 &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";
 };