| Message ID | 20220427161423.647534-4-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' property was deprecated in favor of one defined by > generic dma-common DT bindings. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > arch/arm64/boot/dts/sprd/whale2.dtsi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm64/boot/dts/sprd/whale2.dtsi b/arch/arm64/boot/dts/sprd/whale2.dtsi > index 79b9591c37aa..945f0e02d364 100644 > --- a/arch/arm64/boot/dts/sprd/whale2.dtsi > +++ b/arch/arm64/boot/dts/sprd/whale2.dtsi > @@ -126,7 +126,7 @@ ap_dma: dma-controller@20100000 { > reg = <0 0x20100000 0 0x4000>; > interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; > #dma-cells = <1>; > - #dma-channels = <32>; > + dma-channels = <32>; 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/arm64/boot/dts/sprd/whale2.dtsi b/arch/arm64/boot/dts/sprd/whale2.dtsi index 79b9591c37aa..945f0e02d364 100644 --- a/arch/arm64/boot/dts/sprd/whale2.dtsi +++ b/arch/arm64/boot/dts/sprd/whale2.dtsi @@ -126,7 +126,7 @@ ap_dma: dma-controller@20100000 { reg = <0 0x20100000 0 0x4000>; interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>; #dma-cells = <1>; - #dma-channels = <32>; + dma-channels = <32>; clock-names = "enable"; clocks = <&apahb_gate CLK_DMA_EB>; }; @@ -272,7 +272,7 @@ agcp_dma: dma-controller@41580000 { compatible = "sprd,sc9860-dma"; reg = <0 0x41580000 0 0x4000>; #dma-cells = <1>; - #dma-channels = <32>; + dma-channels = <32>; clock-names = "enable", "ashb_eb"; clocks = <&agcp_gate CLK_AGCP_DMAAP_EB>, <&agcp_gate CLK_AGCP_AP_ASHB_EB>;
The '#dma-channels' property was deprecated in favor of one defined by generic dma-common DT bindings. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm64/boot/dts/sprd/whale2.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)