From: Krzysztof Kozlowski <k...@kernel.org>

[ Upstream commit ea4e792f3c8931fffec4d700cf6197d84e9f35a6 ]

There is no need to keep DMA controller nodes under AMBA bus node.
Remove the "amba" node to fix dtschema warnings like:

  amba: $nodename:0: 'amba' does not match 
'^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'

Signed-off-by: Krzysztof Kozlowski <k...@kernel.org>
Tested-by: Jonathan Bakker <xc-rac...@live.ca>
Link: https://lore.kernel.org/r/20200907161141.31034-6-k...@kernel.org
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 arch/arm/boot/dts/s5pv210.dtsi | 49 +++++++++++++++-------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/arch/arm/boot/dts/s5pv210.dtsi b/arch/arm/boot/dts/s5pv210.dtsi
index 67358562a6ea2..67f70683a2c45 100644
--- a/arch/arm/boot/dts/s5pv210.dtsi
+++ b/arch/arm/boot/dts/s5pv210.dtsi
@@ -126,35 +126,28 @@ wakeup-interrupt-controller {
                        };
                };
 
-               amba {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "simple-bus";
-                       ranges;
-
-                       pdma0: dma@e0900000 {
-                               compatible = "arm,pl330", "arm,primecell";
-                               reg = <0xe0900000 0x1000>;
-                               interrupt-parent = <&vic0>;
-                               interrupts = <19>;
-                               clocks = <&clocks CLK_PDMA0>;
-                               clock-names = "apb_pclk";
-                               #dma-cells = <1>;
-                               #dma-channels = <8>;
-                               #dma-requests = <32>;
-                       };
+               pdma0: dma@e0900000 {
+                       compatible = "arm,pl330", "arm,primecell";
+                       reg = <0xe0900000 0x1000>;
+                       interrupt-parent = <&vic0>;
+                       interrupts = <19>;
+                       clocks = <&clocks CLK_PDMA0>;
+                       clock-names = "apb_pclk";
+                       #dma-cells = <1>;
+                       #dma-channels = <8>;
+                       #dma-requests = <32>;
+               };
 
-                       pdma1: dma@e0a00000 {
-                               compatible = "arm,pl330", "arm,primecell";
-                               reg = <0xe0a00000 0x1000>;
-                               interrupt-parent = <&vic0>;
-                               interrupts = <20>;
-                               clocks = <&clocks CLK_PDMA1>;
-                               clock-names = "apb_pclk";
-                               #dma-cells = <1>;
-                               #dma-channels = <8>;
-                               #dma-requests = <32>;
-                       };
+               pdma1: dma@e0a00000 {
+                       compatible = "arm,pl330", "arm,primecell";
+                       reg = <0xe0a00000 0x1000>;
+                       interrupt-parent = <&vic0>;
+                       interrupts = <20>;
+                       clocks = <&clocks CLK_PDMA1>;
+                       clock-names = "apb_pclk";
+                       #dma-cells = <1>;
+                       #dma-channels = <8>;
+                       #dma-requests = <32>;
                };
 
                spi0: spi@e1300000 {
-- 
2.25.1

Reply via email to