arm64: allwinner: h5: sort the device nodes in / part for some boards

The reg_vcc3v3 node is wrongly placed at the start of the / part, but
not with other fixed regulators used by the board, which makes the
device nodes unsorted.

As Orange Pi Prime and Nano Pi NEO2 device trees are copy'n'paste works,
they share the device node unsorted issue.

Fix this by move reg_vcc3v3 node to the position before reg_usb0_vbus.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
index f6d71b0d482a97bea01a75b726fc112097ff0673..f2767b99c28a7666ca1422541f20b6212a9782be 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
@@ -49,13 +49,6 @@
        model = "FriendlyARM NanoPi NEO 2";
        compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5";
 
-       reg_vcc3v3: vcc3v3 {
-               compatible = "regulator-fixed";
-               regulator-name = "vcc3v3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-       };
-
        aliases {
                serial0 = &uart0;
        };
@@ -79,6 +72,13 @@
                };
        };
 
+       reg_vcc3v3: vcc3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
        reg_usb0_vbus: usb0-vbus {
                compatible = "regulator-fixed";
                regulator-name = "usb0-vbus";

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
index 28d92a612329117e042d260fa3968ef47316b2c5..097c33386190ba5c76fcd03b30764571567bc7a1 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
@@ -53,13 +53,6 @@
        model = "Xunlong Orange Pi Prime";
        compatible = "xunlong,orangepi-prime", "allwinner,sun50i-h5";
 
-       reg_vcc3v3: vcc3v3 {
-               compatible = "regulator-fixed";
-               regulator-name = "vcc3v3";
-               regulator-min-microvolt = <3300000>;
-               regulator-max-microvolt = <3300000>;
-       };
-
        aliases {
                serial0 = &uart0;
        };
@@ -93,6 +86,13 @@
                };
        };
 
+       reg_vcc3v3: vcc3v3 {
+               compatible = "regulator-fixed";
+               regulator-name = "vcc3v3";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+       };
+
        reg_usb0_vbus: usb0-vbus {
                compatible = "regulator-fixed";
                regulator-name = "usb0-vbus";