On Thu, Jul 02, 2020 at 10:34:14PM +0200, Marek Szyprowski wrote: > On 02.07.2020 17:51, Krzysztof Kozlowski wrote: > > 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 > > '^(bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$' > > > > Signed-off-by: Krzysztof Kozlowski <[email protected]> > > > > --- > > > > Changes since v1: > > 1. Remove the bus, as suggested by Marek > > --- > > arch/arm/boot/dts/exynos3250.dtsi | 47 +++---- > > arch/arm/boot/dts/exynos4.dtsi | 70 +++++----- > > .../boot/dts/exynos4210-universal_c210.dts | 2 +- > > arch/arm/boot/dts/exynos5250.dtsi | 92 ++++++------- > > arch/arm/boot/dts/exynos5410.dtsi | 46 +++---- > > arch/arm/boot/dts/exynos5420.dtsi | 130 ++++++++---------- > > 6 files changed, 174 insertions(+), 213 deletions(-) > > > > diff --git a/arch/arm/boot/dts/exynos3250.dtsi > > b/arch/arm/boot/dts/exynos3250.dtsi > > index 044e5da64a76..d3fb45a56527 100644 > > --- a/arch/arm/boot/dts/exynos3250.dtsi > > +++ b/arch/arm/boot/dts/exynos3250.dtsi > > @@ -418,33 +418,26 @@ > > status = "disabled"; > > }; > > > > - amba { > > - compatible = "simple-bus"; > > - #address-cells = <1>; > > - #size-cells = <1>; > > - ranges; > > - > > - pdma0: pdma@12680000 { > > - compatible = "arm,pl330", "arm,primecell"; > > - reg = <0x12680000 0x1000>; > > - interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; > > - clocks = <&cmu CLK_PDMA0>; > > - clock-names = "apb_pclk"; > > - #dma-cells = <1>; > > - #dma-channels = <8>; > > - #dma-requests = <32>; > > - }; > > - > > - pdma1: pdma@12690000 { > > - compatible = "arm,pl330", "arm,primecell"; > > - reg = <0x12690000 0x1000>; > > - interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; > > - clocks = <&cmu CLK_PDMA1>; > > - clock-names = "apb_pclk"; > > - #dma-cells = <1>; > > - #dma-channels = <8>; > > - #dma-requests = <32>; > > - }; > > + pdma0: pdma@12680000 { > > + compatible = "arm,pl330", "arm,primecell"; > > + reg = <0x12680000 0x1000>; > > + interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; > > + clocks = <&cmu CLK_PDMA0>; > > + clock-names = "apb_pclk"; > > + #dma-cells = <1>; > > + #dma-channels = <8>; > > + #dma-requests = <32>; > > + }; > > + > > + pdma1: pdma@12690000 { > > + compatible = "arm,pl330", "arm,primecell"; > > + reg = <0x12690000 0x1000>; > > + interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; > > + clocks = <&cmu CLK_PDMA1>; > > + clock-names = "apb_pclk"; > > + #dma-cells = <1>; > > + #dma-channels = <8>; > > + #dma-requests = <32>; > > }; > > > > adc: adc@126c0000 { > > diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi > > index d2779a790ce3..a1e54449f33f 100644 > > --- a/arch/arm/boot/dts/exynos4.dtsi > > +++ b/arch/arm/boot/dts/exynos4.dtsi > > @@ -669,45 +669,37 @@ > > status = "disabled"; > > }; > > > > - amba: amba { > > - #address-cells = <1>; > > - #size-cells = <1>; > > - compatible = "simple-bus"; > > - interrupt-parent = <&gic>; > > - ranges; > > - > > - pdma0: pdma@12680000 { > > - compatible = "arm,pl330", "arm,primecell"; > > - reg = <0x12680000 0x1000>; > > - interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; > > - clocks = <&clock CLK_PDMA0>; > > - clock-names = "apb_pclk"; > > - #dma-cells = <1>; > > - #dma-channels = <8>; > > - #dma-requests = <32>; > > - }; > > - > > - pdma1: pdma@12690000 { > > - compatible = "arm,pl330", "arm,primecell"; > > - reg = <0x12690000 0x1000>; > > - interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; > > - clocks = <&clock CLK_PDMA1>; > > - clock-names = "apb_pclk"; > > - #dma-cells = <1>; > > - #dma-channels = <8>; > > - #dma-requests = <32>; > > - }; > > - > > - mdma1: mdma@12850000 { > > - compatible = "arm,pl330", "arm,primecell"; > > - reg = <0x12850000 0x1000>; > > - interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; > > - clocks = <&clock CLK_MDMA>; > > - clock-names = "apb_pclk"; > > - #dma-cells = <1>; > > - #dma-channels = <8>; > > - #dma-requests = <1>; > > - }; > > + pdma0: pdma@12680000 { > > + compatible = "arm,pl330", "arm,primecell"; > > + reg = <0x12680000 0x1000>; > > + interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>; > > + clocks = <&clock CLK_PDMA0>; > > + clock-names = "apb_pclk"; > > + #dma-cells = <1>; > > + #dma-channels = <8>; > > + #dma-requests = <32>; > > + }; > > + > > + pdma1: pdma@12690000 { > > + compatible = "arm,pl330", "arm,primecell"; > > + reg = <0x12690000 0x1000>; > > + interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>; > > + clocks = <&clock CLK_PDMA1>; > > + clock-names = "apb_pclk"; > > + #dma-cells = <1>; > > + #dma-channels = <8>; > > + #dma-requests = <32>; > > + }; > > + > > + mdma1: mdma@12850000 { > > + compatible = "arm,pl330", "arm,primecell"; > > + reg = <0x12850000 0x1000>; > > + interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>; > > + clocks = <&clock CLK_MDMA>; > > + clock-names = "apb_pclk"; > > + #dma-cells = <1>; > > + #dma-channels = <8>; > > + #dma-requests = <1>; > > }; > > > > fimd: fimd@11c00000 { > > diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts > > b/arch/arm/boot/dts/exynos4210-universal_c210.dts > > index 02fde1a75ebd..e07aa3aa93bd 100644 > > --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts > > +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts > > @@ -181,7 +181,7 @@ > > }; > > }; > > > > -&amba { > > +&soc { > > > What about the alphabetical order of the labels here?
Yes, I'll keep them ordered. Thanks. Best regards, Krzysztof
