diff options
| author | Tony Lindgren <tony@atomide.com> | 2018-09-20 14:30:45 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2018-09-20 14:30:45 -0700 |
| commit | 0f6e0ed00bc35ca41bf444243fb382f332baa137 (patch) | |
| tree | f44dd0840610830e4a35041ab849db8f9ac4cc69 /arch/arm/boot/dts | |
| parent | 6b63967a61a06263e999fe45f29d9cae295ae31b (diff) | |
| parent | dcbf6b18d81bcdc51390ca1b258c17e2e13b7d0c (diff) | |
Merge branch 'am335x-evm-port-fix' into omap-for-v4.20/dt
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/am335x-evm.dts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index c87d01297a01..98ec9c3e49ba 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts @@ -713,6 +713,7 @@ pinctrl-0 = <&cpsw_default>; pinctrl-1 = <&cpsw_sleep>; status = "okay"; + slaves = <1>; }; &davinci_mdio { @@ -720,15 +721,14 @@ 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@0 { + reg = <0>; + }; }; -&cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; +&cpsw_emac0 { + phy-handle = <ðphy0>; phy-mode = "rgmii-txid"; }; |