ARM: dts: pxa: use new 'dma-channels/requests' properties

The '#dma-channels' and '#dma-requests' properties were deprecated in
favor of these defined by generic dma-common DT bindings.  Add new
properties while keeping old ones for backwards compatibility.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220516142857.6419-2-krzysztof.kozlowski@linaro.org'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index 46984d4..987d792 100644 (file)
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -275,7 +275,9 @@
                                compatible = "marvell,pdma-1.0";
                                reg = <0xd4000000 0x10000>;
                                interrupts = <48>;
+                               /* For backwards compatibility: */
                                #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 a248bf0..5f8300e 100644 (file)
--- a/arch/arm/boot/dts/pxa25x.dtsi
+++ b/arch/arm/boot/dts/pxa25x.dtsi
@@ -38,9 +38,12 @@
                        compatible = "marvell,pdma-1.0";
                        reg = <0x40000000 0x10000>;
                        interrupts = <25>;
-                       #dma-channels = <16>;
                        #dma-cells = <2>;
+                       /* For backwards compatibility: */
+                       #dma-channels = <16>;
+                       dma-channels = <16>;
                        #dma-requests = <40>;
+                       dma-requests = <40>;
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index ccbecad..a2cbfb3 100644 (file)
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -12,9 +12,12 @@
                        compatible = "marvell,pdma-1.0";
                        reg = <0x40000000 0x10000>;
                        interrupts = <25>;
-                       #dma-channels = <32>;
                        #dma-cells = <2>;
+                       /* For backwards compatibility: */
+                       #dma-channels = <32>;
+                       dma-channels = <32>;
                        #dma-requests = <75>;
+                       dma-requests = <75>;
                        status = "okay";
                };
 

diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index d196748..f9c216f 100644 (file)
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -122,9 +122,12 @@
                        compatible = "marvell,pdma-1.0";
                        reg = <0x40000000 0x10000>;
                        interrupts = <25>;
-                       #dma-channels = <32>;
                        #dma-cells = <2>;
+                       /* For backwards compatibility: */
+                       #dma-channels = <32>;
+                       dma-channels = <32>;
                        #dma-requests = <100>;
+                       dma-requests = <100>;
                        status = "okay";
                };