From 05767707a8bb9c869346149c873cfc2320493651 Mon Sep 17 00:00:00 2001 From: Hannes Schmelzer Date: Fri, 13 Dec 2019 08:12:45 +0100 Subject: [PATCH] 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. Signed-off-by: Hannes Schmelzer --- arch/arm/dts/am335x-brsmarc1.dts | 2 ++ arch/arm/dts/am335x-brxre1.dts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/dts/am335x-brsmarc1.dts b/arch/arm/dts/am335x-brsmarc1.dts index e1738b6dde..a63fc2da22 100644 --- 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 = <ðphy0>; phy-mode = "rmii"; ti,ledcr = <0x0480>; }; &cpsw_emac1 { + phy_id = <&davinci_mdio>, <3>; phy-handle = <ðphy1>; phy-mode = "rmii"; ti,ledcr = <0x0480>; diff --git a/arch/arm/dts/am335x-brxre1.dts b/arch/arm/dts/am335x-brxre1.dts index a0d046d07a..33d8ab78d8 100644 --- 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 = <ðphy0>; phy-mode = "mii"; }; &cpsw_emac1 { + phy_id = <&davinci_mdio>, <2>; phy-handle = <ðphy1>; phy-mode = "mii"; }; -- 2.25.1