Merge branch 'am335x-evm-port-fix' into omap-for-v4.20/dt

0f6e0ed0 · Tony Lindgren · 6b63967a · dcbf6b18 · 0f6e0ed0
Commit 0f6e0ed0 authored Sep 20, 2018 by Tony Lindgren
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

arch/arm/boot/dts/am335x-evm.dts arch/arm/boot/dts/am335x-evm.dts +6 -6

No files found.
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -713,6 +713,7 @@ &mac {
 	pinctrl-0 = <&cpsw_default>;
 	pinctrl-1 = <&cpsw_sleep>;
 	status = "okay";
+	slaves = <1>;
 };
 &davinci_mdio {
@@ -720,15 +721,14 @@ &davinci_mdio {
 	pinctrl-0 = <&davinci_mdio_default>;
 	pinctrl-1 = <&davinci_mdio_sleep>;
 	status = "okay";
-};
-&cpsw_emac0 {
+	ethphy0: ethernet-phy@0 {
-	phy_id = <&davinci_mdio>, <0>;
+		reg = <0>;
-	phy-mode = "rgmii-txid";
+	};
 };
-&cpsw_emac1 {
+&cpsw_emac0 {
-	phy_id = <&davinci_mdio>, <1>;
+	phy-handle = <&ethphy0>;
 	phy-mode = "rgmii-txid";
 };