Skip to contentSkip to conversation

dts: am335x-brsmarc1/xre1: insert phy_id again

PATCH New Hannes Schmelzer 2 participants 2 messages Dec 13, 2019 – Dec 14, 2019 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dts: am335x-brsmarc1/xre1: insert phy_id again

commit 3b3e8a37d36e
("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.

---

 arch/arm/dts/am335x-brsmarc1.dts | 2 ++
 arch/arm/dts/am335x-brxre1.dts   | 2 ++
 2 files changed, 4 insertions(+)
arch/arm/dts/am335x-brsmarc1.dts +2 -0
index e1738b6..a63fc2d 100644
@@ -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>;
arch/arm/dts/am335x-brxre1.dts +2 -0
index a0d046d..33d8ab7 100644
@@ -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";
 };
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 dts: am335x-brsmarc1/xre1: insert phy_id again

Quoted 6 lines · Hannes Schmelzer

commit 3b3e8a37d36e
("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.

Quoted 7 lines

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.

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: <https://lists.denx.de/pipermail/u-boot/attachments/20191213/ce5f995c/attachment.sig>