sort alphanumerically.
Signed-off-by: FUKAUMI Naoki <naoki@xxxxxxxxx>
---
Changes in v2:
- none
---
.../boot/dts/rockchip/rk3588-rock-5b.dts | 56 +++++++++----------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index fbe231973b24..08f5efeeac9c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -473,21 +473,6 @@ &sdhci {
status = "okay";
};
-&sdmmc {
- max-frequency = <200000000>;
- no-sdio;
- no-mmc;
- bus-width = <4>;
- cap-mmc-highspeed;
- cap-sd-highspeed;
- cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
- disable-wp;
- sd-uhs-sdr104;
- vmmc-supply = <&vcc_3v3_s3>;
- vqmmc-supply = <&vccio_sd_s0>;
- status = "okay";
-};
-
&sdio {
max-frequency = <200000000>;
no-sd;
@@ -509,6 +494,21 @@ &sdio {
status = "okay";
};
+&sdmmc {
+ max-frequency = <200000000>;
+ no-sdio;
+ no-mmc;
+ bus-width = <4>;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
+ cd-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_LOW>;
+ disable-wp;
+ sd-uhs-sdr104;
+ vmmc-supply = <&vcc_3v3_s3>;
+ vqmmc-supply = <&vccio_sd_s0>;
+ status = "okay";
+};
+
&sfc {
pinctrl-names = "default";
pinctrl-0 = <&fspim2_pins>;
@@ -523,12 +523,6 @@ flash@0 {
};
};
-&uart6 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
- status = "okay";
-};
-
&spi2 {
status = "okay";
assigned-clocks = <&cru CLK_SPI2>;
@@ -858,11 +852,6 @@ &tsadc {
status = "okay";
};
-&uart2 {
- pinctrl-0 = <&uart2m0_xfer>;
- status = "okay";
-};
-
&u2phy1 {
status = "okay";
};
@@ -891,7 +880,14 @@ &u2phy3_host {
status = "okay";
};
-&usbdp_phy1 {
+&uart2 {
+ pinctrl-0 = <&uart2m0_xfer>;
+ status = "okay";
+};
+
+&uart6 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart6m1_xfer &uart6m1_ctsn &uart6m1_rtsn>;
status = "okay";
};
@@ -920,7 +916,7 @@ &usb_host2_xhci {
status = "okay";
};
-&vop_mmu {
+&usbdp_phy1 {
status = "okay";
};
@@ -928,6 +924,10 @@ &vop {
status = "okay";
};
+&vop_mmu {
+ status = "okay";
+};
+
&vp0 {
vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
reg = <ROCKCHIP_VOP2_EP_HDMI0>;
--
2.43.0
