Sort nodes alphabetically, and remove the ethernet alias duplicated from the SoC device tree.
Signed-off-by: Samuel Holland samuel@sholland.org --- arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 41 ++++++++++++++++----------------- 1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts index 780d59a096..fd8cfc6ff3 100644 --- a/arch/arm/dts/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm/dts/sun50i-h5-orangepi-pc2.dts @@ -60,7 +60,6 @@
aliases { serial0 = &uart0; - ethernet0 = &emac; };
soc { @@ -73,6 +72,22 @@ }; };
+&ehci1 { + status = "okay"; +}; + +&emac { + pinctrl-names = "default"; + pinctrl-0 = <&emac_rgmii_pins>; + phy-mode = "rgmii"; + phy = <&phy1>; + status = "okay"; + + phy1: ethernet-phy@1 { + reg = <1>; + }; +}; + &mmc0 { compatible = "allwinner,sun50i-h5-mmc", "allwinner,sun50i-a64-mmc", @@ -86,32 +101,16 @@ status = "okay"; };
-&uart0 { - pinctrl-names = "default"; - pinctrl-0 = <&uart0_pins_a>; - status = "okay"; -}; - -&usbphy { - status = "okay"; -}; - &ohci1 { status = "okay"; };
-&ehci1 { +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins_a>; status = "okay"; };
-&emac { - pinctrl-names = "default"; - pinctrl-0 = <&emac_rgmii_pins>; - phy-mode = "rgmii"; - phy = <&phy1>; +&usbphy { status = "okay"; - - phy1: ethernet-phy@1 { - reg = <1>; - }; };