From ca4017a76186dc400fab49e3295ea01735a4cf44 Mon Sep 17 00:00:00 2001
From: Tao Huang <huangtao@rock-chips.com>
Date: Tue, 17 Nov 2020 10:16:55 +0800
Subject: [PATCH] arm64: dts: rockchip: rk3568-evb: Sort the nodes
 alphabetically

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iacdcabbd3def46db8747e6fb69529218c3880a91
---
 arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi | 104 +++++++++----------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
index 4ebc98cb1188..17732298d1d4 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
@@ -1002,10 +1002,6 @@ &hdmi {
 	status = "okay";
 };
 
-&hdmi_sound {
-	status = "okay";
-};
-
 &hdmi_in_vp0 {
 	status = "okay";
 };
@@ -1014,6 +1010,10 @@ &hdmi_in_vp1 {
 	status = "disabled";
 };
 
+&hdmi_sound {
+	status = "okay";
+};
+
 &i2c0 {
 	status = "okay";
 
@@ -1478,19 +1478,13 @@ &saradc {
 	vref-supply = <&vcca_1v8>;
 };
 
-&sdmmc2 {
-	max-frequency = <150000000>;
-	supports-sdio;
-	bus-width = <4>;
-	disable-wp;
-	cap-sd-highspeed;
-	cap-sdio-irq;
-	keep-power-in-suspend;
-	mmc-pwrseq = <&sdio_pwrseq>;
+&sdhci {
+	bus-width = <8>;
+	supports-emmc;
 	non-removable;
-	pinctrl-names = "default";
-	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
-	sd-uhs-sdr104;
+	keep-power-in-suspend;
+	rockchip,txclk-tapnum = <0x10>;
+	max-frequency = <200000000>;
 	status = "okay";
 };
 
@@ -1509,13 +1503,19 @@ &sdmmc0 {
 	status = "okay";
 };
 
-&sdhci {
-	bus-width = <8>;
-	supports-emmc;
-	non-removable;
+&sdmmc2 {
+	max-frequency = <150000000>;
+	supports-sdio;
+	bus-width = <4>;
+	disable-wp;
+	cap-sd-highspeed;
+	cap-sdio-irq;
 	keep-power-in-suspend;
-	rockchip,txclk-tapnum = <0x10>;
-	max-frequency = <200000000>;
+	mmc-pwrseq = <&sdio_pwrseq>;
+	non-removable;
+	pinctrl-names = "default";
+	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
+	sd-uhs-sdr104;
 	status = "okay";
 };
 
@@ -1532,32 +1532,32 @@ &tsadc {
 	status = "okay";
 };
 
+&u2phy0_host {
+	phy-supply = <&vcc5v0_host>;
+	status = "okay";
+};
+
+&u2phy0_otg {
+	vbus-supply = <&vcc5v0_otg>;
+	status = "okay";
+};
+
+&u2phy1_host {
+	phy-supply = <&vcc5v0_host>;
+	status = "okay";
+};
+
+&u2phy1_otg {
+	phy-supply = <&vcc5v0_host>;
+	status = "okay";
+};
+
 &usb2phy0 {
 	status = "okay";
-
-	u2phy0_host: host-port {
-		phy-supply = <&vcc5v0_host>;
-		status = "okay";
-	};
-
-	u2phy0_otg: otg-port {
-		vbus-supply = <&vcc5v0_otg>;
-		status = "okay";
-	};
 };
 
 &usb2phy1 {
 	status = "okay";
-
-	u2phy1_host: host-port {
-		phy-supply = <&vcc5v0_host>;
-		status = "okay";
-	};
-
-	u2phy1_otg: otg-port {
-		phy-supply = <&vcc5v0_host>;
-		status = "okay";
-	};
 };
 
 &usb_host0_ehci {
@@ -1576,23 +1576,23 @@ &usb_host1_ohci {
 	status = "okay";
 };
 
+&usbdrd_dwc3 {
+	dr_mode = "otg";
+	extcon = <&usb2phy0>;
+	maximum-speed = "high-speed";
+	status = "okay";
+};
+
 &usbdrd30 {
 	status = "okay";
+};
 
-	usbdrd_dwc3: dwc3@fcc00000 {
-		dr_mode = "otg";
-		extcon = <&usb2phy0>;
-		maximum-speed = "high-speed";
-		status = "okay";
-	};
+&usbhost_dwc3 {
+	status = "okay";
 };
 
 &usbhost30 {
 	status = "okay";
-
-	usbhost_dwc3: dwc3@fd000000 {
-		status = "okay";
-	};
 };
 
 &vad {