arm64: dts: allwinner: a523: Move mmc nodes to correct position

When the mmc nodes were added to the dtsi file, they were inserted in
the incorrect position.

Move them to the correct place.

Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Link: https://patch.msgid.link/20250628161608.3072968-3-wens@kernel.org
Signed-off-by: Chen-Yu Tsai <wens@csie.org>

diff --git a/arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi b/arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi
index 8b7cbc2e78f500e1dc704e9a6bee87e70285509f..458d7ecedacd477099921a0702eabef56a1320b5 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun55i-a523.dtsi
@@ -181,69 +181,6 @@
                        #reset-cells = <1>;
                };
 
-               mmc0: mmc@4020000 {
-                       compatible = "allwinner,sun55i-a523-mmc",
-                                    "allwinner,sun20i-d1-mmc";
-                       reg = <0x04020000 0x1000>;
-                       clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>;
-                       clock-names = "ahb", "mmc";
-                       resets = <&ccu RST_BUS_MMC0>;
-                       reset-names = "ahb";
-                       interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&mmc0_pins>;
-                       status = "disabled";
-
-                       max-frequency = <150000000>;
-                       cap-sd-highspeed;
-                       cap-mmc-highspeed;
-                       cap-sdio-irq;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-               };
-
-               mmc1: mmc@4021000 {
-                       compatible = "allwinner,sun55i-a523-mmc",
-                                    "allwinner,sun20i-d1-mmc";
-                       reg = <0x04021000 0x1000>;
-                       clocks = <&ccu CLK_BUS_MMC1>, <&ccu CLK_MMC1>;
-                       clock-names = "ahb", "mmc";
-                       resets = <&ccu RST_BUS_MMC1>;
-                       reset-names = "ahb";
-                       interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&mmc1_pins>;
-                       status = "disabled";
-
-                       max-frequency = <150000000>;
-                       cap-sd-highspeed;
-                       cap-mmc-highspeed;
-                       cap-sdio-irq;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-               };
-
-               mmc2: mmc@4022000 {
-                       compatible = "allwinner,sun55i-a523-mmc",
-                                    "allwinner,sun20i-d1-mmc";
-                       reg = <0x04022000 0x1000>;
-                       clocks = <&ccu CLK_BUS_MMC2>, <&ccu CLK_MMC2>;
-                       clock-names = "ahb", "mmc";
-                       resets = <&ccu RST_BUS_MMC2>;
-                       reset-names = "ahb";
-                       interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
-                       pinctrl-names = "default";
-                       pinctrl-0 = <&mmc2_pins>;
-                       status = "disabled";
-
-                       max-frequency = <150000000>;
-                       cap-sd-highspeed;
-                       cap-mmc-highspeed;
-                       cap-sdio-irq;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-               };
-
                wdt: watchdog@2050000 {
                        compatible = "allwinner,sun55i-a523-wdt";
                        reg = <0x2050000 0x20>;
@@ -449,6 +386,69 @@
                        };
                };
 
+               mmc0: mmc@4020000 {
+                       compatible = "allwinner,sun55i-a523-mmc",
+                                    "allwinner,sun20i-d1-mmc";
+                       reg = <0x04020000 0x1000>;
+                       clocks = <&ccu CLK_BUS_MMC0>, <&ccu CLK_MMC0>;
+                       clock-names = "ahb", "mmc";
+                       resets = <&ccu RST_BUS_MMC0>;
+                       reset-names = "ahb";
+                       interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mmc0_pins>;
+                       status = "disabled";
+
+                       max-frequency = <150000000>;
+                       cap-sd-highspeed;
+                       cap-mmc-highspeed;
+                       cap-sdio-irq;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+
+               mmc1: mmc@4021000 {
+                       compatible = "allwinner,sun55i-a523-mmc",
+                                    "allwinner,sun20i-d1-mmc";
+                       reg = <0x04021000 0x1000>;
+                       clocks = <&ccu CLK_BUS_MMC1>, <&ccu CLK_MMC1>;
+                       clock-names = "ahb", "mmc";
+                       resets = <&ccu RST_BUS_MMC1>;
+                       reset-names = "ahb";
+                       interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mmc1_pins>;
+                       status = "disabled";
+
+                       max-frequency = <150000000>;
+                       cap-sd-highspeed;
+                       cap-mmc-highspeed;
+                       cap-sdio-irq;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+
+               mmc2: mmc@4022000 {
+                       compatible = "allwinner,sun55i-a523-mmc",
+                                    "allwinner,sun20i-d1-mmc";
+                       reg = <0x04022000 0x1000>;
+                       clocks = <&ccu CLK_BUS_MMC2>, <&ccu CLK_MMC2>;
+                       clock-names = "ahb", "mmc";
+                       resets = <&ccu RST_BUS_MMC2>;
+                       reset-names = "ahb";
+                       interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mmc2_pins>;
+                       status = "disabled";
+
+                       max-frequency = <150000000>;
+                       cap-sd-highspeed;
+                       cap-mmc-highspeed;
+                       cap-sdio-irq;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+               };
+
                usb_otg: usb@4100000 {
                        compatible = "allwinner,sun55i-a523-musb",
                                     "allwinner,sun8i-a33-musb";