Merge branch 'am335x-evm-port-fix' into omap-for-v4.20/dt (0f6e0ed0) · Commits · e / devices / android_kernel_fairphone_FP5

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

+6 −6

Original line number	Diff line number	Diff line
		@@ -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 = <&ethphy0>;
		phy-mode = "rgmii-txid";
		};