arm: dts: rockchip: rk3288: move dma-controller nodes

In order to better compare the Linux rk3288.dtsi version
with the u-boot version move the dma-controller nodes
to the DT root.

Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 12566a0..9fb6d86 100644 (file)
--- a/arch/arm/dts/rk3288.dtsi
+++ b/arch/arm/dts/rk3288.dtsi
@@ -86,47 +86,6 @@
                };
        };
 
-       amba {
-               compatible = "arm,amba-bus";
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-
-               dmac_peri: dma-controller@ff250000 {
-                       compatible = "arm,pl330", "arm,primecell";
-                       broken-no-flushp;
-                       reg = <0xff250000 0x4000>;
-                       interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
-                       #dma-cells = <1>;
-                       clocks = <&cru ACLK_DMAC2>;
-                       clock-names = "apb_pclk";
-               };
-
-               dmac_bus_ns: dma-controller@ff600000 {
-                       compatible = "arm,pl330", "arm,primecell";
-                       broken-no-flushp;
-                       reg = <0xff600000 0x4000>;
-                       interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-                       #dma-cells = <1>;
-                       clocks = <&cru ACLK_DMAC1>;
-                       clock-names = "apb_pclk";
-                       status = "disabled";
-               };
-
-               dmac_bus_s: dma-controller@ffb20000 {
-                       compatible = "arm,pl330", "arm,primecell";
-                       broken-no-flushp;
-                       reg = <0xffb20000 0x4000>;
-                       interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
-                                    <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
-                       #dma-cells = <1>;
-                       clocks = <&cru ACLK_DMAC1>;
-                       clock-names = "apb_pclk";
-               };
-       };
-
        xin24m: oscillator {
                compatible = "fixed-clock";
                clock-frequency = <24000000>;
@@ -367,6 +326,18 @@
                pinctrl-0 = <&uart4_xfer>;
                status = "disabled";
        };
+
+       dmac_peri: dma-controller@ff250000 {
+               compatible = "arm,pl330", "arm,primecell";
+               reg = <0xff250000 0x4000>;
+               interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;
+               #dma-cells = <1>;
+               broken-no-flushp;
+               clocks = <&cru ACLK_DMAC2>;
+               clock-names = "apb_pclk";
+       };
+
        thermal: thermal-zones {
                #include "rk3288-thermal.dtsi"
        };
@@ -458,6 +429,18 @@
                status = "disabled";
        };
 
+       dmac_bus_ns: dma-controller@ff600000 {
+               compatible = "arm,pl330", "arm,primecell";
+               reg = <0xff600000 0x4000>;
+               interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+               #dma-cells = <1>;
+               broken-no-flushp;
+               clocks = <&cru ACLK_DMAC1>;
+               clock-names = "apb_pclk";
+               status = "disabled";
+       };
+
        i2c0: i2c@ff650000 {
                compatible = "rockchip,rk3288-i2c";
                reg = <0xff650000 0x1000>;
@@ -870,6 +853,17 @@
                status = "disabled";
        };
 
+       dmac_bus_s: dma-controller@ffb20000 {
+               compatible = "arm,pl330", "arm,primecell";
+               reg = <0xffb20000 0x4000>;
+               interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
+                            <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
+               #dma-cells = <1>;
+               broken-no-flushp;
+               clocks = <&cru ACLK_DMAC1>;
+               clock-names = "apb_pclk";
+       };
+
        efuse: efuse@ffb40000 {
                compatible = "rockchip,rk3288-efuse";
                reg = <0xffb40000 0x10000>;