arm64: dts: rockchip: sort nodes/properties on rk3399-rock-4

sort nodes/properties alphabetically

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
Link: https://lore.kernel.org/r/20220909195006.127957-5-naoki@radxa.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
index bb1dcf3..485277f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -74,32 +74,33 @@
                };
        };
 
-       vcc12v_dcin: dc-12v {
+       vbus_typec: vbus-typec-regulator {
                compatible = "regulator-fixed";
-               regulator-name = "vcc12v_dcin";
+               enable-active-high;
+               gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&vcc5v0_typec_en>;
+               regulator-name = "vbus_typec";
                regulator-always-on;
-               regulator-boot-on;
-               regulator-min-microvolt = <12000000>;
-               regulator-max-microvolt = <12000000>;
+               vin-supply = <&vcc5v0_sys>;
        };
 
-       vcc5v0_sys: vcc-sys {
+       vcc12v_dcin: dc-12v {
                compatible = "regulator-fixed";
-               regulator-name = "vcc5v0_sys";
+               regulator-name = "vcc12v_dcin";
                regulator-always-on;
                regulator-boot-on;
-               regulator-min-microvolt = <5000000>;
-               regulator-max-microvolt = <5000000>;
-               vin-supply = <&vcc12v_dcin>;
+               regulator-min-microvolt = <12000000>;
+               regulator-max-microvolt = <12000000>;
        };
 
-       vcc_0v9: vcc-0v9 {
+       vcc3v3_lan: vcc3v3-lan-regulator {
                compatible = "regulator-fixed";
-               regulator-name = "vcc_0v9";
+               regulator-name = "vcc3v3_lan";
                regulator-always-on;
                regulator-boot-on;
-               regulator-min-microvolt = <900000>;
-               regulator-max-microvolt = <900000>;
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
                vin-supply = <&vcc3v3_sys>;
        };
 
@@ -136,24 +137,23 @@
                vin-supply = <&vcc5v0_sys>;
        };
 
-       vbus_typec: vbus-typec-regulator {
+       vcc5v0_sys: vcc-sys {
                compatible = "regulator-fixed";
-               enable-active-high;
-               gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&vcc5v0_typec_en>;
-               regulator-name = "vbus_typec";
+               regulator-name = "vcc5v0_sys";
                regulator-always-on;
-               vin-supply = <&vcc5v0_sys>;
+               regulator-boot-on;
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               vin-supply = <&vcc12v_dcin>;
        };
 
-       vcc3v3_lan: vcc3v3-lan-regulator {
+       vcc_0v9: vcc-0v9 {
                compatible = "regulator-fixed";
-               regulator-name = "vcc3v3_lan";
+               regulator-name = "vcc_0v9";
                regulator-always-on;
                regulator-boot-on;
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
+               regulator-min-microvolt = <900000>;
+               regulator-max-microvolt = <900000>;
                vin-supply = <&vcc3v3_sys>;
        };
 
@@ -515,21 +515,10 @@
 };
 
 &io_domains {
-       status = "okay";
-
-       bt656-supply = <&vcc_3v0>;
        audio-supply = <&vcca1v8_codec>;
-       sdmmc-supply = <&vcc_sdio>;
+       bt656-supply = <&vcc_3v0>;
        gpio1830-supply = <&vcc_3v0>;
-};
-
-&pmu_io_domains {
-       status = "okay";
-
-       pmu1830-supply = <&vcc_3v0>;
-};
-
-&pcie_phy {
+       sdmmc-supply = <&vcc_sdio>;
        status = "okay";
 };
 
@@ -544,6 +533,10 @@
        status = "okay";
 };
 
+&pcie_phy {
+       status = "okay";
+};
+
 &pinctrl {
        bt {
                bt_enable_h: bt-enable-h {
@@ -581,6 +574,20 @@
                };
        };
 
+       pmic {
+               pmic_int_l: pmic-int-l {
+                       rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
+               };
+
+               vsel1_pin: vsel1-pin {
+                       rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
+               };
+
+               vsel2_pin: vsel2-pin {
+                       rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
+               };
+       };
+
        sdio0 {
                sdio0_bus4: sdio0-bus4 {
                        rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
@@ -598,20 +605,6 @@
                };
        };
 
-       pmic {
-               pmic_int_l: pmic-int-l {
-                       rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
-               };
-
-               vsel1_pin: vsel1-pin {
-                       rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
-               };
-
-               vsel2_pin: vsel2-pin {
-                       rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
-               };
-       };
-
        usb-typec {
                vcc5v0_typec_en: vcc5v0-typec-en {
                        rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -635,6 +628,11 @@
        };
 };
 
+&pmu_io_domains {
+       pmu1830-supply = <&vcc_3v0>;
+       status = "okay";
+};
+
 &pwm2 {
        status = "okay";
 };
@@ -645,6 +643,14 @@
        vref-supply = <&vcc_1v8>;
 };
 
+&sdhci {
+       bus-width = <8>;
+       mmc-hs400-1_8v;
+       mmc-hs400-enhanced-strobe;
+       non-removable;
+       status = "okay";
+};
+
 &sdio0 {
        #address-cells = <1>;
        #size-cells = <0>;
@@ -672,14 +678,6 @@
        status = "okay";
 };
 
-&sdhci {
-       bus-width = <8>;
-       mmc-hs400-1_8v;
-       mmc-hs400-enhanced-strobe;
-       non-removable;
-       status = "okay";
-};
-
 &spdif {
 
        spdif_p0: port {
@@ -761,13 +759,13 @@
        status = "okay";
 };
 
-&usbdrd_dwc3_0 {
+&usbdrd3_1 {
        status = "okay";
-       dr_mode = "host";
 };
 
-&usbdrd3_1 {
+&usbdrd_dwc3_0 {
        status = "okay";
+       dr_mode = "host";
 };
 
 &usbdrd_dwc3_1 {