[PATCH 5/7] arm64: dts: rockchip: Sort usb nodes on NanoPC-T6

From: Diederik de Haas

Date: Fri Aug 28 2026 - 07:47:25 EST


Nodes shall be ordered alpha-numerically by the node name.

Signed-off-by: Diederik de Haas <diederik@xxxxxxxxxxxxxx>
---
.../boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 72 +++++++++----------
1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
index 2c9390d2968c..e42b2a14fc82 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi
@@ -1164,12 +1164,6 @@ &tsadc {
status = "okay";
};

-&uart2 {
- pinctrl-0 = <&uart2m0_xfer>;
- pinctrl-names = "default";
- status = "okay";
-};
-
&u2phy0 {
status = "okay";
};
@@ -1186,15 +1180,11 @@ &u2phy1_otg {
status = "okay";
};

-&u2phy2_host {
- status = "okay";
-};
-
-&u2phy3_host {
+&u2phy2 {
status = "okay";
};

-&u2phy2 {
+&u2phy2_host {
status = "okay";
};

@@ -1202,31 +1192,13 @@ &u2phy3 {
status = "okay";
};

-&usbdp_phy0 {
- mode-switch;
- orientation-switch;
- sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
- sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
+&u2phy3_host {
status = "okay";
-
- port {
- #address-cells = <1>;
- #size-cells = <0>;
-
- usbdp_phy0_typec_ss: endpoint@0 {
- reg = <0>;
- remote-endpoint = <&usbc0_ss>;
- };
-
- usbdp_phy0_typec_sbu: endpoint@1 {
- reg = <1>;
- remote-endpoint = <&usbc0_sbu>;
- };
- };
};

-&usbdp_phy1 {
- phy-supply = <&vbus5v0_usb>;
+&uart2 {
+ pinctrl-0 = <&uart2m0_xfer>;
+ pinctrl-names = "default";
status = "okay";
};

@@ -1249,16 +1221,44 @@ usb_host0_xhci_drd_sw: endpoint {
};
};

+&usb_host1_ehci {
+ status = "okay";
+};
+
+&usb_host1_ohci {
+ status = "okay";
+};
+
&usb_host1_xhci {
dr_mode = "host";
status = "okay";
};

-&usb_host1_ehci {
+&usbdp_phy0 {
+ mode-switch;
+ orientation-switch;
+ sbu1-dc-gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
+ sbu2-dc-gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_HIGH>;
status = "okay";
+
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ usbdp_phy0_typec_ss: endpoint@0 {
+ reg = <0>;
+ remote-endpoint = <&usbc0_ss>;
+ };
+
+ usbdp_phy0_typec_sbu: endpoint@1 {
+ reg = <1>;
+ remote-endpoint = <&usbc0_sbu>;
+ };
+ };
};

-&usb_host1_ohci {
+&usbdp_phy1 {
+ phy-supply = <&vbus5v0_usb>;
status = "okay";
};

--
2.55.0