| Message ID | 20220427161459.647676-5-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | dmaengine/ARM: use proper 'dma-channels/requests' properties | expand |
On 27/04/2022 18:14, Krzysztof Kozlowski wrote: > The '#dma-channels' and '#dma-requests' properties were deprecated in > favor of these defined by generic dma-common DT bindings. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > arch/arm/boot/dts/mmp2.dtsi | 2 +- > arch/arm/boot/dts/pxa25x.dtsi | 4 ++-- > arch/arm/boot/dts/pxa27x.dtsi | 4 ++-- > arch/arm/boot/dts/pxa3xx.dtsi | 4 ++-- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi > index 46984d4c5224..1a49b58e8048 100644 > --- a/arch/arm/boot/dts/mmp2.dtsi > +++ b/arch/arm/boot/dts/mmp2.dtsi > @@ -275,7 +275,7 @@ dma-controller@d4000000 { > compatible = "marvell,pdma-1.0"; > reg = <0xd4000000 0x10000>; > interrupts = <48>; > - #dma-channels = <16>; > + dma-channels = <16>; As Rob proposed, the removal of old property does not have to happen in this patch (but much later). This would allow merging DTS change immediately. I will resend in that spirit, unless SoC maintainers prefer the original approach (where DTS has to wait for next release)? Best regards, Krzysztof
diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi index 46984d4c5224..1a49b58e8048 100644 --- a/arch/arm/boot/dts/mmp2.dtsi +++ b/arch/arm/boot/dts/mmp2.dtsi @@ -275,7 +275,7 @@ dma-controller@d4000000 { compatible = "marvell,pdma-1.0"; reg = <0xd4000000 0x10000>; interrupts = <48>; - #dma-channels = <16>; + dma-channels = <16>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/pxa25x.dtsi b/arch/arm/boot/dts/pxa25x.dtsi index a248bf038033..0d2d09cad059 100644 --- a/arch/arm/boot/dts/pxa25x.dtsi +++ b/arch/arm/boot/dts/pxa25x.dtsi @@ -38,9 +38,9 @@ pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; reg = <0x40000000 0x10000>; interrupts = <25>; - #dma-channels = <16>; #dma-cells = <2>; - #dma-requests = <40>; + dma-channels = <16>; + dma-requests = <40>; status = "okay"; }; diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi index ccbecad9c5c7..68b940fabe5f 100644 --- a/arch/arm/boot/dts/pxa27x.dtsi +++ b/arch/arm/boot/dts/pxa27x.dtsi @@ -12,9 +12,9 @@ pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; reg = <0x40000000 0x10000>; interrupts = <25>; - #dma-channels = <32>; #dma-cells = <2>; - #dma-requests = <75>; + dma-channels = <32>; + dma-requests = <75>; status = "okay"; }; diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi index d19674812cd2..f1fa7f54a398 100644 --- a/arch/arm/boot/dts/pxa3xx.dtsi +++ b/arch/arm/boot/dts/pxa3xx.dtsi @@ -122,9 +122,9 @@ pdma: dma-controller@40000000 { compatible = "marvell,pdma-1.0"; reg = <0x40000000 0x10000>; interrupts = <25>; - #dma-channels = <32>; #dma-cells = <2>; - #dma-requests = <100>; + dma-channels = <32>; + dma-requests = <100>; status = "okay"; };
The '#dma-channels' and '#dma-requests' properties were deprecated in favor of these defined by generic dma-common DT bindings. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm/boot/dts/mmp2.dtsi | 2 +- arch/arm/boot/dts/pxa25x.dtsi | 4 ++-- arch/arm/boot/dts/pxa27x.dtsi | 4 ++-- arch/arm/boot/dts/pxa3xx.dtsi | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)