| Message ID | 20220427155840.596535-9-krzysztof.kozlowski@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | ARM/arm64: dts: use proper 'dma-channels/requests' properties | expand |
>-----Original Message----- >From: Krzysztof Kozlowski [mailto:krzysztof.kozlowski@linaro.org] >Sent: Wednesday, April 27, 2022 9:29 PM >To: Lee Jones <lee.jones@linaro.org>; Rob Herring <robh+dt@kernel.org>; >Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>; Alim Akhtar ><alim.akhtar@samsung.com>; Dinh Nguyen <dinguyen@kernel.org>; Michal >Simek <michal.simek@xilinx.com>; Liviu Dudau <liviu.dudau@arm.com>; >Sudeep Holla <sudeep.holla@arm.com>; Lorenzo Pieralisi ><lorenzo.pieralisi@arm.com>; Ray Jui <rjui@broadcom.com>; Scott Branden ><sbranden@broadcom.com>; Broadcom Kernel Team <bcm-kernel-feedback- >list@broadcom.com>; Sylwester Nawrocki <s.nawrocki@samsung.com>; >devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux- >samsung-soc@vger.kernel.org; linux-kernel@vger.kernel.org >Cc: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>; Rob Herring ><robh@kernel.org> >Subject: [PATCH 08/10] ARM: dts: exynos: use proper 'dma- >channels/requests' properties > >pl330 DMA controller bindings documented 'dma-channels' and 'dma- >requests' properties (without leading hash sign), so fix the DTS to match the >bindings. > >Reported-by: Rob Herring <robh@kernel.org> >Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >--- Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com> > arch/arm/boot/dts/exynos3250.dtsi | 8 ++++---- > arch/arm/boot/dts/exynos4.dtsi | 12 +++++------ > .../boot/dts/exynos4210-universal_c210.dts | 4 ++-- > arch/arm/boot/dts/exynos5250.dtsi | 16 +++++++-------- > arch/arm/boot/dts/exynos5410.dtsi | 8 ++++---- > arch/arm/boot/dts/exynos5420.dtsi | 20 +++++++++---------- > 6 files changed, 34 insertions(+), 34 deletions(-) > >diff --git a/arch/arm/boot/dts/exynos3250.dtsi >b/arch/arm/boot/dts/exynos3250.dtsi >index 41bb421e67c2..7bdd4f0782c3 100644 >--- a/arch/arm/boot/dts/exynos3250.dtsi >+++ b/arch/arm/boot/dts/exynos3250.dtsi >@@ -429,8 +429,8 @@ pdma0: dma-controller@12680000 { > clocks = <&cmu CLK_PDMA0>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ dma-channels = <8>; >+ dma-requests = <32>; > }; > > pdma1: dma-controller@12690000 { >@@ -440,8 +440,8 @@ pdma1: dma-controller@12690000 { > clocks = <&cmu CLK_PDMA1>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ 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 5fd17bc52321..2a244aaf84b4 100644 >--- a/arch/arm/boot/dts/exynos4.dtsi >+++ b/arch/arm/boot/dts/exynos4.dtsi >@@ -676,8 +676,8 @@ pdma0: dma-controller@12680000 { > clocks = <&clock CLK_PDMA0>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ dma-channels = <8>; >+ dma-requests = <32>; > }; > > pdma1: dma-controller@12690000 { >@@ -687,8 +687,8 @@ pdma1: dma-controller@12690000 { > clocks = <&clock CLK_PDMA1>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ dma-channels = <8>; >+ dma-requests = <32>; > }; > > mdma1: dma-controller@12850000 { >@@ -698,8 +698,8 @@ mdma1: dma-controller@12850000 { > clocks = <&clock CLK_MDMA>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <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 138d606d58a5..c1b11704b8ee 100644 >--- a/arch/arm/boot/dts/exynos4210-universal_c210.dts >+++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts >@@ -666,8 +666,8 @@ mdma0: dma-controller@12840000 { > clocks = <&clock CLK_MDMA>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <1>; >+ dma-channels = <8>; >+ dma-requests = <1>; > power-domains = <&pd_lcd0>; > }; > }; >diff --git a/arch/arm/boot/dts/exynos5250.dtsi >b/arch/arm/boot/dts/exynos5250.dtsi >index df80ddfada2d..c4c0b4c08094 100644 >--- a/arch/arm/boot/dts/exynos5250.dtsi >+++ b/arch/arm/boot/dts/exynos5250.dtsi >@@ -700,8 +700,8 @@ pdma0: dma-controller@121a0000 { > clocks = <&clock CLK_PDMA0>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ dma-channels = <8>; >+ dma-requests = <32>; > }; > > pdma1: dma-controller@121b0000 { >@@ -711,8 +711,8 @@ pdma1: dma-controller@121b0000 { > clocks = <&clock CLK_PDMA1>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ dma-channels = <8>; >+ dma-requests = <32>; > }; > > mdma0: dma-controller@10800000 { >@@ -722,8 +722,8 @@ mdma0: dma-controller@10800000 { > clocks = <&clock CLK_MDMA0>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <1>; >+ dma-channels = <8>; >+ dma-requests = <1>; > }; > > mdma1: dma-controller@11c10000 { >@@ -733,8 +733,8 @@ mdma1: dma-controller@11c10000 { > clocks = <&clock CLK_MDMA1>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <1>; >+ dma-channels = <8>; >+ dma-requests = <1>; > }; > > gsc_0: gsc@13e00000 { >diff --git a/arch/arm/boot/dts/exynos5410.dtsi >b/arch/arm/boot/dts/exynos5410.dtsi >index 4d797a9abba4..6dc08cb0622c 100644 >--- a/arch/arm/boot/dts/exynos5410.dtsi >+++ b/arch/arm/boot/dts/exynos5410.dtsi >@@ -196,8 +196,8 @@ pdma0: dma-controller@121a0000 { > clocks = <&clock CLK_PDMA0>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ dma-channels = <8>; >+ dma-requests = <32>; > }; > > pdma1: dma-controller@121b0000 { >@@ -207,8 +207,8 @@ pdma1: dma-controller@121b0000 { > clocks = <&clock CLK_PDMA1>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ dma-channels = <8>; >+ dma-requests = <32>; > }; > > audi2s0: i2s@3830000 { >diff --git a/arch/arm/boot/dts/exynos5420.dtsi >b/arch/arm/boot/dts/exynos5420.dtsi >index 21b608705049..08198d82ce8d 100644 >--- a/arch/arm/boot/dts/exynos5420.dtsi >+++ b/arch/arm/boot/dts/exynos5420.dtsi >@@ -437,8 +437,8 @@ adma: dma-controller@3880000 { > clocks = <&clock_audss EXYNOS_ADMA>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <6>; >- #dma-requests = <16>; >+ dma-channels = <6>; >+ dma-requests = <16>; > power-domains = <&mau_pd>; > }; > >@@ -449,8 +449,8 @@ pdma0: dma-controller@121a0000 { > clocks = <&clock CLK_PDMA0>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ dma-channels = <8>; >+ dma-requests = <32>; > }; > > pdma1: dma-controller@121b0000 { >@@ -460,8 +460,8 @@ pdma1: dma-controller@121b0000 { > clocks = <&clock CLK_PDMA1>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <32>; >+ dma-channels = <8>; >+ dma-requests = <32>; > }; > > mdma0: dma-controller@10800000 { >@@ -471,8 +471,8 @@ mdma0: dma-controller@10800000 { > clocks = <&clock CLK_MDMA0>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <1>; >+ dma-channels = <8>; >+ dma-requests = <1>; > }; > > mdma1: dma-controller@11c10000 { >@@ -482,8 +482,8 @@ mdma1: dma-controller@11c10000 { > clocks = <&clock CLK_MDMA1>; > clock-names = "apb_pclk"; > #dma-cells = <1>; >- #dma-channels = <8>; >- #dma-requests = <1>; >+ dma-channels = <8>; >+ dma-requests = <1>; > /* > * MDMA1 can support both secure and non-secure > * AXI transactions. When this is enabled in >-- >2.32.0
diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi index 41bb421e67c2..7bdd4f0782c3 100644 --- a/arch/arm/boot/dts/exynos3250.dtsi +++ b/arch/arm/boot/dts/exynos3250.dtsi @@ -429,8 +429,8 @@ pdma0: dma-controller@12680000 { clocks = <&cmu CLK_PDMA0>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + dma-channels = <8>; + dma-requests = <32>; }; pdma1: dma-controller@12690000 { @@ -440,8 +440,8 @@ pdma1: dma-controller@12690000 { clocks = <&cmu CLK_PDMA1>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + 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 5fd17bc52321..2a244aaf84b4 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -676,8 +676,8 @@ pdma0: dma-controller@12680000 { clocks = <&clock CLK_PDMA0>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + dma-channels = <8>; + dma-requests = <32>; }; pdma1: dma-controller@12690000 { @@ -687,8 +687,8 @@ pdma1: dma-controller@12690000 { clocks = <&clock CLK_PDMA1>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + dma-channels = <8>; + dma-requests = <32>; }; mdma1: dma-controller@12850000 { @@ -698,8 +698,8 @@ mdma1: dma-controller@12850000 { clocks = <&clock CLK_MDMA>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <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 138d606d58a5..c1b11704b8ee 100644 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts @@ -666,8 +666,8 @@ mdma0: dma-controller@12840000 { clocks = <&clock CLK_MDMA>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <1>; + dma-channels = <8>; + dma-requests = <1>; power-domains = <&pd_lcd0>; }; }; diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index df80ddfada2d..c4c0b4c08094 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -700,8 +700,8 @@ pdma0: dma-controller@121a0000 { clocks = <&clock CLK_PDMA0>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + dma-channels = <8>; + dma-requests = <32>; }; pdma1: dma-controller@121b0000 { @@ -711,8 +711,8 @@ pdma1: dma-controller@121b0000 { clocks = <&clock CLK_PDMA1>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + dma-channels = <8>; + dma-requests = <32>; }; mdma0: dma-controller@10800000 { @@ -722,8 +722,8 @@ mdma0: dma-controller@10800000 { clocks = <&clock CLK_MDMA0>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <1>; + dma-channels = <8>; + dma-requests = <1>; }; mdma1: dma-controller@11c10000 { @@ -733,8 +733,8 @@ mdma1: dma-controller@11c10000 { clocks = <&clock CLK_MDMA1>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <1>; + dma-channels = <8>; + dma-requests = <1>; }; gsc_0: gsc@13e00000 { diff --git a/arch/arm/boot/dts/exynos5410.dtsi b/arch/arm/boot/dts/exynos5410.dtsi index 4d797a9abba4..6dc08cb0622c 100644 --- a/arch/arm/boot/dts/exynos5410.dtsi +++ b/arch/arm/boot/dts/exynos5410.dtsi @@ -196,8 +196,8 @@ pdma0: dma-controller@121a0000 { clocks = <&clock CLK_PDMA0>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + dma-channels = <8>; + dma-requests = <32>; }; pdma1: dma-controller@121b0000 { @@ -207,8 +207,8 @@ pdma1: dma-controller@121b0000 { clocks = <&clock CLK_PDMA1>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + dma-channels = <8>; + dma-requests = <32>; }; audi2s0: i2s@3830000 { diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 21b608705049..08198d82ce8d 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -437,8 +437,8 @@ adma: dma-controller@3880000 { clocks = <&clock_audss EXYNOS_ADMA>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <6>; - #dma-requests = <16>; + dma-channels = <6>; + dma-requests = <16>; power-domains = <&mau_pd>; }; @@ -449,8 +449,8 @@ pdma0: dma-controller@121a0000 { clocks = <&clock CLK_PDMA0>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + dma-channels = <8>; + dma-requests = <32>; }; pdma1: dma-controller@121b0000 { @@ -460,8 +460,8 @@ pdma1: dma-controller@121b0000 { clocks = <&clock CLK_PDMA1>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <32>; + dma-channels = <8>; + dma-requests = <32>; }; mdma0: dma-controller@10800000 { @@ -471,8 +471,8 @@ mdma0: dma-controller@10800000 { clocks = <&clock CLK_MDMA0>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <1>; + dma-channels = <8>; + dma-requests = <1>; }; mdma1: dma-controller@11c10000 { @@ -482,8 +482,8 @@ mdma1: dma-controller@11c10000 { clocks = <&clock CLK_MDMA1>; clock-names = "apb_pclk"; #dma-cells = <1>; - #dma-channels = <8>; - #dma-requests = <1>; + dma-channels = <8>; + dma-requests = <1>; /* * MDMA1 can support both secure and non-secure * AXI transactions. When this is enabled in
pl330 DMA controller bindings documented 'dma-channels' and 'dma-requests' properties (without leading hash sign), so fix the DTS to match the bindings. Reported-by: Rob Herring <robh@kernel.org> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm/boot/dts/exynos3250.dtsi | 8 ++++---- arch/arm/boot/dts/exynos4.dtsi | 12 +++++------ .../boot/dts/exynos4210-universal_c210.dts | 4 ++-- arch/arm/boot/dts/exynos5250.dtsi | 16 +++++++-------- arch/arm/boot/dts/exynos5410.dtsi | 8 ++++---- arch/arm/boot/dts/exynos5420.dtsi | 20 +++++++++---------- 6 files changed, 34 insertions(+), 34 deletions(-)