]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
dts: am335x-brsmarc1/xre1: insert phy_id again
authorHannes Schmelzer <hannes.schmelzer@br-automation.com>
Fri, 13 Dec 2019 07:12:45 +0000 (08:12 +0100)
committerTom Rini <trini@konsulko.com>
Fri, 13 Dec 2019 18:01:12 +0000 (13:01 -0500)
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.

Signed-off-by: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
arch/arm/dts/am335x-brsmarc1.dts
arch/arm/dts/am335x-brxre1.dts

index e1738b6dde3fa8af1bb76ca8635bc8e9135d07b0..a63fc2da22b8d1d089fb93c902aea54e4bcd3135 100644 (file)
 };
 
 &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>;
index a0d046d07a196dfc2cb03f60f6fa42e73e8eb9ac..33d8ab78d8e7218b789fb1474ccd4cbc323ca8b2 100644 (file)
 };
 
 &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";
 };