Re: [PATCH v1] arm: dts: rockchip: rk3288: move dma-controller nodes

[Kever Yang]

On 2022/5/2 19:22, Johan Jonker wrote:

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 


Reviewed-by: Kever Yang 

Thanks,
- Kever

---
  arch/arm/dts/rk3288.dtsi | 76 ++--
  1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 469df94e..53ee760b 100644
--- 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@ff25 {
-   compatible = "arm,pl330", "arm,primecell";
-   broken-no-flushp;
-   reg = <0xff25 0x4000>;
-   interrupts = ,
-;
-   #dma-cells = <1>;
-   clocks = <&cru ACLK_DMAC2>;
-   clock-names = "apb_pclk";
-   };
-
-   dmac_bus_ns: dma-controller@ff60 {
-   compatible = "arm,pl330", "arm,primecell";
-   broken-no-flushp;
-   reg = <0xff60 0x4000>;
-   interrupts = ,
-;
-   #dma-cells = <1>;
-   clocks = <&cru ACLK_DMAC1>;
-   clock-names = "apb_pclk";
-   status = "disabled";
-   };
-
-   dmac_bus_s: dma-controller@ffb2 {
-   compatible = "arm,pl330", "arm,primecell";
-   broken-no-flushp;
-   reg = <0xffb2 0x4000>;
-   interrupts = ,
-;
-   #dma-cells = <1>;
-   clocks = <&cru ACLK_DMAC1>;
-   clock-names = "apb_pclk";
-   };
-   };
-
xin24m: oscillator {
compatible = "fixed-clock";
clock-frequency = <2400>;
@@ -367,6 +326,18 @@
pinctrl-0 = <&uart4_xfer>;
status = "disabled";
};
+
+   dmac_peri: dma-controller@ff25 {
+   compatible = "arm,pl330", "arm,primecell";
+   reg = <0xff25 0x4000>;
+   interrupts = ,
+;
+   #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@ff60 {

+   compatible = "arm,pl330", "arm,primecell";
+   reg = <0xff60 0x4000>;
+   interrupts = ,
+;
+   #dma-cells = <1>;
+   broken-no-flushp;
+   clocks = <&cru ACLK_DMAC1>;
+   clock-names = "apb_pclk";
+   status = "disabled";
+   };
+
i2c0: i2c@ff65 {
compatible = "rockchip,rk3288-i2c";
reg = <0xff65 0x1000>;
@@ -870,6 +853,17 @@
status = "disabled";
};
  
+	dmac_bus_s: dma-controller@ffb2 {

+   compatible = "arm,pl330", "arm,primecell";
+   reg = <0xffb2 0x4000>;
+   interrupts = ,
+;
+   #dma-cells = <1>;
+   broken-no-flushp;
+   clocks = <&cru ACLK_DMAC1>;
+   clock-names = "apb_pclk";
+   };
+
efuse: efuse@ffb4 {
compatible = "rockchip,rk3288-efuse";
reg = <0xffb4 0x1>;

[PATCH v1] arm: dts: rockchip: rk3288: move dma-controller nodes

[Johan Jonker]

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 
---
 arch/arm/dts/rk3288.dtsi | 76 ++--
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/arch/arm/dts/rk3288.dtsi b/arch/arm/dts/rk3288.dtsi
index 469df94e..53ee760b 100644
--- 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@ff25 {
-   compatible = "arm,pl330", "arm,primecell";
-   broken-no-flushp;
-   reg = <0xff25 0x4000>;
-   interrupts = ,
-;
-   #dma-cells = <1>;
-   clocks = <&cru ACLK_DMAC2>;
-   clock-names = "apb_pclk";
-   };
-
-   dmac_bus_ns: dma-controller@ff60 {
-   compatible = "arm,pl330", "arm,primecell";
-   broken-no-flushp;
-   reg = <0xff60 0x4000>;
-   interrupts = ,
-;
-   #dma-cells = <1>;
-   clocks = <&cru ACLK_DMAC1>;
-   clock-names = "apb_pclk";
-   status = "disabled";
-   };
-
-   dmac_bus_s: dma-controller@ffb2 {
-   compatible = "arm,pl330", "arm,primecell";
-   broken-no-flushp;
-   reg = <0xffb2 0x4000>;
-   interrupts = ,
-;
-   #dma-cells = <1>;
-   clocks = <&cru ACLK_DMAC1>;
-   clock-names = "apb_pclk";
-   };
-   };
-
xin24m: oscillator {
compatible = "fixed-clock";
clock-frequency = <2400>;
@@ -367,6 +326,18 @@
pinctrl-0 = <&uart4_xfer>;
status = "disabled";
};
+
+   dmac_peri: dma-controller@ff25 {
+   compatible = "arm,pl330", "arm,primecell";
+   reg = <0xff25 0x4000>;
+   interrupts = ,
+;
+   #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@ff60 {
+   compatible = "arm,pl330", "arm,primecell";
+   reg = <0xff60 0x4000>;
+   interrupts = ,
+;
+   #dma-cells = <1>;
+   broken-no-flushp;
+   clocks = <&cru ACLK_DMAC1>;
+   clock-names = "apb_pclk";
+   status = "disabled";
+   };
+
i2c0: i2c@ff65 {
compatible = "rockchip,rk3288-i2c";
reg = <0xff65 0x1000>;
@@ -870,6 +853,17 @@
status = "disabled";
};
 
+   dmac_bus_s: dma-controller@ffb2 {
+   compatible = "arm,pl330", "arm,primecell";
+   reg = <0xffb2 0x4000>;
+   interrupts = ,
+;
+   #dma-cells = <1>;
+   broken-no-flushp;
+   clocks = <&cru ACLK_DMAC1>;
+   clock-names = "apb_pclk";
+   };
+
efuse: efuse@ffb4 {
compatible = "rockchip,rk3288-efuse";
reg = <0xffb4 0x1>;
-- 
2.20.1