ARM: dts: mediatek: mt6582: move MMIO devices under soc node

Memory mapped devices are part of soc. So, add such node and move those
devices into it.

Signed-off-by: Cristian Cozzolino <cristian_ci@protonmail.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm/boot/dts/mediatek/mt6582.dtsi b/arch/arm/boot/dts/mediatek/mt6582.dtsi
index 4263371784cd15db7af0ceb49dd069b62b623639..37d2b8786188aecb65c0a6e0d31aabc3b66e2bd7 100644 (file)
--- a/arch/arm/boot/dts/mediatek/mt6582.dtsi
+++ b/arch/arm/boot/dts/mediatek/mt6582.dtsi
@@ -56,73 +56,80 @@
                #clock-cells = <0>;
        };
 
-       timer: timer@11008000 {
-               compatible = "mediatek,mt6577-timer";
-               reg = <0x10008000 0x80>;
-               interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_LOW>;
-               clocks = <&system_clk>, <&rtc_clk>;
-               clock-names = "system-clk", "rtc-clk";
-       };
+       soc {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "simple-bus";
+               ranges;
 
-       sysirq: interrupt-controller@10200100 {
-               compatible = "mediatek,mt6582-sysirq",
-                            "mediatek,mt6577-sysirq";
-               interrupt-controller;
-               #interrupt-cells = <3>;
-               interrupt-parent = <&gic>;
-               reg = <0x10200100 0x1c>;
-       };
+               timer: timer@11008000 {
+                       compatible = "mediatek,mt6577-timer";
+                       reg = <0x10008000 0x80>;
+                       interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_LOW>;
+                       clocks = <&system_clk>, <&rtc_clk>;
+                       clock-names = "system-clk", "rtc-clk";
+               };
 
-       gic: interrupt-controller@10211000 {
-               compatible = "arm,cortex-a7-gic";
-               interrupt-controller;
-               #interrupt-cells = <3>;
-               interrupt-parent = <&gic>;
-               reg = <0x10211000 0x1000>,
-                     <0x10212000 0x2000>,
-                     <0x10214000 0x2000>,
-                     <0x10216000 0x2000>;
-       };
+               sysirq: interrupt-controller@10200100 {
+                       compatible = "mediatek,mt6582-sysirq",
+                                    "mediatek,mt6577-sysirq";
+                       interrupt-controller;
+                       #interrupt-cells = <3>;
+                       interrupt-parent = <&gic>;
+                       reg = <0x10200100 0x1c>;
+               };
 
-       uart0: serial@11002000 {
-               compatible = "mediatek,mt6582-uart",
-                            "mediatek,mt6577-uart";
-               reg = <0x11002000 0x400>;
-               interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_LOW>;
-               clocks = <&uart_clk>;
-               status = "disabled";
-       };
+               gic: interrupt-controller@10211000 {
+                       compatible = "arm,cortex-a7-gic";
+                       interrupt-controller;
+                       #interrupt-cells = <3>;
+                       interrupt-parent = <&gic>;
+                       reg = <0x10211000 0x1000>,
+                             <0x10212000 0x2000>,
+                             <0x10214000 0x2000>,
+                             <0x10216000 0x2000>;
+               };
 
-       uart1: serial@11003000 {
-               compatible = "mediatek,mt6582-uart",
-                            "mediatek,mt6577-uart";
-               reg = <0x11003000 0x400>;
-               interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_LOW>;
-               clocks = <&uart_clk>;
-               status = "disabled";
-       };
+               uart0: serial@11002000 {
+                       compatible = "mediatek,mt6582-uart",
+                                    "mediatek,mt6577-uart";
+                       reg = <0x11002000 0x400>;
+                       interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_LOW>;
+                       clocks = <&uart_clk>;
+                       status = "disabled";
+               };
 
-       uart2: serial@11004000 {
-               compatible = "mediatek,mt6582-uart",
-                            "mediatek,mt6577-uart";
-               reg = <0x11004000 0x400>;
-               interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_LOW>;
-               clocks = <&uart_clk>;
-               status = "disabled";
-       };
+               uart1: serial@11003000 {
+                       compatible = "mediatek,mt6582-uart",
+                                    "mediatek,mt6577-uart";
+                       reg = <0x11003000 0x400>;
+                       interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_LOW>;
+                       clocks = <&uart_clk>;
+                       status = "disabled";
+               };
 
-       uart3: serial@11005000 {
-               compatible = "mediatek,mt6582-uart",
-                            "mediatek,mt6577-uart";
-               reg = <0x11005000 0x400>;
-               interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_LOW>;
-               clocks = <&uart_clk>;
-               status = "disabled";
-       };
+               uart2: serial@11004000 {
+                       compatible = "mediatek,mt6582-uart",
+                                    "mediatek,mt6577-uart";
+                       reg = <0x11004000 0x400>;
+                       interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_LOW>;
+                       clocks = <&uart_clk>;
+                       status = "disabled";
+               };
+
+               uart3: serial@11005000 {
+                       compatible = "mediatek,mt6582-uart",
+                                    "mediatek,mt6577-uart";
+                       reg = <0x11005000 0x400>;
+                       interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_LOW>;
+                       clocks = <&uart_clk>;
+                       status = "disabled";
+               };
 
-       watchdog: watchdog@10007000 {
-               compatible = "mediatek,mt6582-wdt",
-                            "mediatek,mt6589-wdt";
-               reg = <0x10007000 0x100>;
+               watchdog: watchdog@10007000 {
+                       compatible = "mediatek,mt6582-wdt",
+                                    "mediatek,mt6589-wdt";
+                       reg = <0x10007000 0x100>;
+               };
        };
 };