[GIT PULL / PATCH v2 0/3] arm/arm64: dts: cleanups for dma-channels

[GIT PULL / PATCH v2 0/3] arm/arm64: dts: cleanups for dma-channels

[Krzysztof Kozlowski]

Hi Arnd and Olof,

These three patches were sent on the lists previously, but they did not
get picked up. Can you apply them directly?

Original sets:
 - https://lore.kernel.org/all/20220503065407.52188-1-krzysztof.kozlowski@linaro.org/
 - https://lore.kernel.org/all/20220503065201.51818-6-krzysztof.kozlowski@linaro.org/
 - https://lore.kernel.org/all/CADBw62oQbc4a9HxFFmO0E-bDvVvPnUo=raVOaSXZpLkKsNo-tQ@mail.gmail.com/

Changes since v1
================
1. Keep old properties, so the original patchset (drivers+DTS) is bisectable.
2. Add review tags.

Best regards,
Krzysztof


Krzysztof Kozlowski (3):
  ARM: dts: pxa: use new 'dma-channels/requests' properties
  ARM: dts: da850: use new 'dma-channels' property
  arm64: dts: sprd: use new 'dma-channels' property

 arch/arm/boot/dts/da850.dtsi         | 2 ++
 arch/arm/boot/dts/mmp2.dtsi          | 2 ++
 arch/arm/boot/dts/pxa25x.dtsi        | 5 ++++-
 arch/arm/boot/dts/pxa27x.dtsi        | 5 ++++-
 arch/arm/boot/dts/pxa3xx.dtsi        | 5 ++++-
 arch/arm64/boot/dts/sprd/whale2.dtsi | 4 ++++
 6 files changed, 20 insertions(+), 3 deletions(-)

-- 
2.32.0

[PATCH v2 1/3] ARM: dts: pxa: use new 'dma-channels/requests' properties

[Krzysztof Kozlowski]

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>
---
 arch/arm/boot/dts/mmp2.dtsi   | 2 ++
 arch/arm/boot/dts/pxa25x.dtsi | 5 ++++-
 arch/arm/boot/dts/pxa27x.dtsi | 5 ++++-
 arch/arm/boot/dts/pxa3xx.dtsi | 5 ++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/mmp2.dtsi b/arch/arm/boot/dts/mmp2.dtsi
index 46984d4c5224..987d792f67ea 100644
--- a/arch/arm/boot/dts/mmp2.dtsi
+++ b/arch/arm/boot/dts/mmp2.dtsi
@@ -275,7 +275,9 @@ dma-controller@d4000000 {
 				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 a248bf038033..5f8300e356ad 100644
--- a/arch/arm/boot/dts/pxa25x.dtsi
+++ b/arch/arm/boot/dts/pxa25x.dtsi
@@ -38,9 +38,12 @@ pdma: dma-controller@40000000 {
 			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 ccbecad9c5c7..a2cbfb3be609 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -12,9 +12,12 @@ pdma: dma-controller@40000000 {
 			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 d19674812cd2..f9c216f91865 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -122,9 +122,12 @@ pdma: dma-controller@40000000 {
 			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";
 		};
 
-- 
2.32.0

[PATCH v2 2/3] ARM: dts: da850: use new 'dma-channels' property

[Krzysztof Kozlowski]

The '#dma-channels' property was deprecated in favor of one defined by
generic dma-common DT bindings.  Add new property while keeping old one
for backwards compatibility.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 arch/arm/boot/dts/da850.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index c3942b4e82ad..0386376fa486 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -679,7 +679,9 @@ cppi41dma: dma-controller@201000 {
 					    "scheduler", "queuemgr";
 				interrupts = <58>;
 				#dma-cells = <2>;
+				/* For backwards compatibility: */
 				#dma-channels = <4>;
+				dma-channels = <4>;
 				power-domains = <&psc1 1>;
 				status = "okay";
 			};
-- 
2.32.0

[PATCH v2 3/3] arm64: dts: sprd: use new 'dma-channels' property

[Krzysztof Kozlowski]

The '#dma-channels' property was deprecated in favor of one defined by
generic dma-common DT bindings.  Add new property while keeping old one
for backwards compatibility.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Baolin Wang <baolin.wang7@gmail.com>
---
 arch/arm64/boot/dts/sprd/whale2.dtsi | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/sprd/whale2.dtsi b/arch/arm64/boot/dts/sprd/whale2.dtsi
index 79b9591c37aa..89d91abbd5d1 100644
--- a/arch/arm64/boot/dts/sprd/whale2.dtsi
+++ b/arch/arm64/boot/dts/sprd/whale2.dtsi
@@ -126,7 +126,9 @@ ap_dma: dma-controller@20100000 {
 				reg = <0 0x20100000 0 0x4000>;
 				interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;
 				#dma-cells = <1>;
+				/* For backwards compatibility: */
 				#dma-channels = <32>;
+				dma-channels = <32>;
 				clock-names = "enable";
 				clocks = <&apahb_gate CLK_DMA_EB>;
 			};
@@ -272,7 +274,9 @@ agcp_dma: dma-controller@41580000 {
 				compatible = "sprd,sc9860-dma";
 				reg = <0 0x41580000 0 0x4000>;
 				#dma-cells = <1>;
+				/* For backwards compatibility: */
 				#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>;
-- 
2.32.0

Re: [GIT PULL / PATCH v2 0/3] arm/arm64: dts: cleanups for dma-channels

[patchwork-bot+linux-soc]

Hello:

This series was applied to soc/soc.git (for-next)
by Arnd Bergmann <arnd@arndb.de>:

On Mon, 16 May 2022 16:28:54 +0200 you wrote:
> Hi Arnd and Olof,
> 
> These three patches were sent on the lists previously, but they did not
> get picked up. Can you apply them directly?
> 
> Original sets:
>  - https://lore.kernel.org/all/20220503065407.52188-1-krzysztof.kozlowski@linaro.org/
>  - https://lore.kernel.org/all/20220503065201.51818-6-krzysztof.kozlowski@linaro.org/
>  - https://lore.kernel.org/all/CADBw62oQbc4a9HxFFmO0E-bDvVvPnUo=raVOaSXZpLkKsNo-tQ@mail.gmail.com/
> 
> [...]

Here is the summary with links:
  - [v2,1/3] ARM: dts: pxa: use new 'dma-channels/requests' properties
    https://git.kernel.org/soc/soc/c/286b8073541b
  - [v2,2/3] ARM: dts: da850: use new 'dma-channels' property
    https://git.kernel.org/soc/soc/c/22a798d7b234
  - [v2,3/3] arm64: dts: sprd: use new 'dma-channels' property
    https://git.kernel.org/soc/soc/c/6fe1953e008d

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html