Skip to contentSkip to conversation

Use generic dma node name for Qcom platforms

PATCH In review Kuldeep Singh 2 participants 9 messages Apr 21, 2022 – Apr 28, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v4 cover Use generic dma node name for Qcom platforms

This patch series is changed from previous version as there's an alternate contribution to convert BAM to DT schema. This patchset now defines generic dma node name for Qualcomm armv7 based platforms.

Looking forward towards review comments. Thanks!

---
v4:
- Drop 3/6 and 6/6 patch from v3 series
- s/User/Use in commit description of all patches
- Didn't drop Krzysztof's R-b tag as I fixed a simple typo
- Alternate contribution for BAM:
https://lore.kernel.org/lkml/[email protected]/T/#m6700c2695ee78e79060ac338d208ffd08ac39%20+592
- Keep only armv7 based dts patches now
---
v3:
- https://lore.kernel.org/linux-devicetree/[email protected]/
- Add Krzysztof's R-b tags for dts changes
- Add qcom,ee as required property(Krzysztof)
- Use type as boolean
- Add min/max to qcom,ee
- Clocks are required ones, skip them as it's users are not fixed.
---
v2:
- https://lore.kernel.org/linux-devicetree/[email protected]/
- Add more variants of ip4019-ap/dk-{01/04/07} for dma node rename
- Add #dma-cells in binding file
- use additionalproperties as false
---
v1:
- https://lore.kernel.org/linux-devicetree/[email protected]/#t
---

Kuldeep Singh (4):
ARM: dts: qcom: apq8064: Use generic node name for DMA
ARM: dts: qcom: mdm9615: Use generic node name for DMA
ARM: dts: qcom: ipq4019: Use generic node name for DMA
ARM: dts: qcom: ipq8064: Use generic node name for DMA

 arch/arm/boot/dts/qcom-apq8064.dtsi             | 6 +++---
 arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi   | 4 ++--
 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 2 +-
 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi   | 2 +-
 arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi   | 4 ++--
 arch/arm/boot/dts/qcom-ipq4019.dtsi             | 6 +++---
 arch/arm/boot/dts/qcom-ipq8064.dtsi             | 4 ++--
 arch/arm/boot/dts/qcom-mdm9615.dtsi             | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH v4 1/4 ARM: dts: qcom: apq8064: Use generic node name for DMA

Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.

---
 arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/qcom-apq8064.dtsi +3 -3
index a1c8ae516d21..b2975be3ae04 100644
@@ -1040,7 +1040,7 @@ sata0: sata@29000000 {
 		};
 
 		/* Temporary fixed regulator */
-		sdcc1bam:dma@12402000{
+		sdcc1bam: dma-controller@12402000{
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x12402000 0x8000>;
 			interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -1050,7 +1050,7 @@ sdcc1bam:dma@12402000{
 			qcom,ee = <0>;
 		};
 
-		sdcc3bam:dma@12182000{
+		sdcc3bam: dma-controller@12182000{
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x12182000 0x8000>;
 			interrupts = <0 96 IRQ_TYPE_LEVEL_HIGH>;
@@ -1060,7 +1060,7 @@ sdcc3bam:dma@12182000{
 			qcom,ee = <0>;
 		};
 
-		sdcc4bam:dma@121c2000{
+		sdcc4bam: dma-controller@121c2000{
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x121c2000 0x8000>;
 			interrupts = <0 95 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.25.1
#2 lore raw

Re: [PATCH v4 1/4] ARM: dts: qcom: apq8064: Use generic node name for DMA

Quoted 5 lines · Kuldeep Singh

Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.

It seems that I picked up v3, but patchwork-bot didn't send out any notifications.

Please double check linux-next to confirm that we got them all sorted out.

Thanks,
Bjorn

Quoted 38 lines
---
 arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/qcom-apq8064.dtsi +3 -3
index a1c8ae516d21..b2975be3ae04 100644
@@ -1040,7 +1040,7 @@ sata0: sata@29000000 {
 		};
 
 		/* Temporary fixed regulator */
-		sdcc1bam:dma@12402000{
+		sdcc1bam: dma-controller@12402000{
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x12402000 0x8000>;
 			interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -1050,7 +1050,7 @@ sdcc1bam:dma@12402000{
 			qcom,ee = <0>;
 		};
 
-		sdcc3bam:dma@12182000{
+		sdcc3bam: dma-controller@12182000{
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x12182000 0x8000>;
 			interrupts = <0 96 IRQ_TYPE_LEVEL_HIGH>;
@@ -1060,7 +1060,7 @@ sdcc3bam:dma@12182000{
 			qcom,ee = <0>;
 		};
 
-		sdcc4bam:dma@121c2000{
+		sdcc4bam: dma-controller@121c2000{
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x121c2000 0x8000>;
 			interrupts = <0 95 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.25.1
#3 lore raw

Re: [PATCH v4 1/4] ARM: dts: qcom: apq8064: Use generic node name for DMA

Quoted 10 lines · Bjorn Andersson
Quoted 5 lines · Kuldeep Singh

Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.

It seems that I picked up v3, but patchwork-bot didn't send out any notifications.

Yes, somehow there was no notification for this series as well as geni uart/i2c patches also.

Quoted 3 lines

Please double check linux-next to confirm that we got them all sorted out.

I checked dma dts patches[1] and they are in next/linux-next. I hope I checked the right tree, please correct me if it's wrong.

Please note, there was one small typo fix from v3->v4 in commit header(s/User/Use). Not sure if it's worth updating as it's already in next tree, upto you. Thanks!

-Kuldeep
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=fb1bdb7e787a6037f501869b5aaf9e5cabe7a7bc
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=fbf64afd16b9581ae5a89c6924b50f83041463e0
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=095a7137ba3630bcca11e6017bfd4ab48b7fc12e
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=a86efc02b34104b93a0f9707d1e61577671fc4ad
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=7224013d4b5a64c43be23204bcfb4070dbd7fd76

#4 lore raw

Re: [PATCH v4 1/4] ARM: dts: qcom: apq8064: Use generic node name for DMA

Quoted 19 lines · Kuldeep Singh
Quoted 10 lines · Bjorn Andersson
Quoted 5 lines · Kuldeep Singh

Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.

It seems that I picked up v3, but patchwork-bot didn't send out any notifications.

Yes, somehow there was no notification for this series as well as geni uart/i2c patches also.

Quoted 3 lines

Please double check linux-next to confirm that we got them all sorted out.

Quoted 7 lines

I checked dma dts patches[1] and they are in next/linux-next. I hope I checked the right tree, please correct me if it's wrong.

Please note, there was one small typo fix from v3->v4 in commit header(s/User/Use). Not sure if it's worth updating as it's already in next tree, upto you. Thanks!

I generally never rebase my trees, as that's causing issues for anyone references commits in my tree. So we'll have to live with this typo.

Thanks,
Bjorn

#5 lore raw

Re: [PATCH v4 1/4] ARM: dts: qcom: apq8064: Use generic node name for DMA

Quoted 2 lines

I generally never rebase my trees, as that's causing issues for anyone references commits in my tree. So we'll have to live with this typo.

Sure Bjorn, this was completely unintentional and next time, will try to fix it before it's accepted. Thanks!

#6 lore raw

PATCH v4 2/4 ARM: dts: qcom: mdm9615: Use generic node name for DMA

In reply to Kuldeep Singh

Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.

---
 arch/arm/boot/dts/qcom-mdm9615.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/qcom-mdm9615.dtsi +2 -2
index 4d4f37cebf21..8f0752ce1c7b 100644
@@ -330,7 +330,7 @@ pmicgpio: gpio@150 {
 			};
 		};
 
-		sdcc1bam: dma@12182000{
+		sdcc1bam: dma-controller@12182000{
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x12182000 0x8000>;
 			interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -340,7 +340,7 @@ sdcc1bam: dma@12182000{
 			qcom,ee = <0>;
 		};
 
-		sdcc2bam: dma@12142000{
+		sdcc2bam: dma-controller@12142000{
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x12142000 0x8000>;
 			interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.25.1
#7 lore raw

PATCH v4 3/4 ARM: dts: qcom: ipq4019: Use generic node name for DMA

In reply to Kuldeep Singh

Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.

---
 arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi   | 4 ++--
 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 2 +-
 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi   | 2 +-
 arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi   | 4 ++--
 arch/arm/boot/dts/qcom-ipq4019.dtsi             | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi +2 -2
index 0c10d9e096db..03bb9e1768c4 100644
@@ -64,7 +64,7 @@ pinconf_cs {
 			};
 		};
 
-		blsp_dma: dma@7884000 {
+		blsp_dma: dma-controller@7884000 {
 			status = "okay";
 		};
 
@@ -89,7 +89,7 @@ serial@78af000 {
 			status = "okay";
 		};
 
-		cryptobam: dma@8e04000 {
+		cryptobam: dma-controller@8e04000 {
 			status = "okay";
 		};
 
arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts +1 -1
index a7b1201dd614..79b0c6318e52 100644
@@ -8,7 +8,7 @@ / {
 	compatible = "qcom,ipq4019-dk04.1-c1", "qcom,ipq4019";
 
 	soc {
-		dma@7984000 {
+		dma-controller@7984000 {
 			status = "okay";
 		};
 
arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi +1 -1
index 7a337dc08741..2a43367692fd 100644
@@ -79,7 +79,7 @@ serial@78b0000 {
 			status = "okay";
 		};
 
-		dma@7884000 {
+		dma-controller@7884000 {
 			status = "okay";
 		};
 
arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi +2 -2
index 94872518b5a2..0107f552f520 100644
@@ -52,7 +52,7 @@ serial@78af000 {
 			status = "okay";
 		};
 
-		dma@7884000 {
+		dma-controller@7884000 {
 			status = "okay";
 		};
 
@@ -62,7 +62,7 @@ i2c@78b7000 { /* BLSP1 QUP2 */
 			status = "okay";
 		};
 
-		dma@7984000 {
+		dma-controller@7984000 {
 			status = "okay";
 		};
 
arch/arm/boot/dts/qcom-ipq4019.dtsi +3 -3
index a9d0566a3190..258510eb30fc 100644
@@ -233,7 +233,7 @@ sdhci: sdhci@7824900 {
 			status = "disabled";
 		};
 
-		blsp_dma: dma@7884000 {
+		blsp_dma: dma-controller@7884000 {
 			compatible = "qcom,bam-v1.7.0";
 			reg = <0x07884000 0x23000>;
 			interrupts = <GIC_SPI 238 IRQ_TYPE_LEVEL_HIGH>;
@@ -300,7 +300,7 @@ blsp1_i2c4: i2c@78b8000 { /* BLSP1 QUP4 */
 			status = "disabled";
 		};
 
-		cryptobam: dma@8e04000 {
+		cryptobam: dma-controller@8e04000 {
 			compatible = "qcom,bam-v1.7.0";
 			reg = <0x08e04000 0x20000>;
 			interrupts = <GIC_SPI 207 IRQ_TYPE_LEVEL_HIGH>;
@@ -471,7 +471,7 @@ pcie0: pci@40000000 {
 			status = "disabled";
 		};
 
-		qpic_bam: dma@7984000 {
+		qpic_bam: dma-controller@7984000 {
 			compatible = "qcom,bam-v1.7.0";
 			reg = <0x7984000 0x1a000>;
 			interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.25.1
#8 lore raw

PATCH v4 4/4 ARM: dts: qcom: ipq8064: Use generic node name for DMA

In reply to Kuldeep Singh

Qcom BAM DT spec expects generic DMA controller node name as "dma-controller" to enable validations.

---
 arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/qcom-ipq8064.dtsi +2 -2
index 8cb04aa8ed2f..7e68d4b1527f 100644
@@ -1155,7 +1155,7 @@ vsdcc_fixed: vsdcc-regulator {
 			regulator-always-on;
 		};
 
-		sdcc1bam: dma@12402000 {
+		sdcc1bam: dma-controller@12402000 {
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x12402000 0x8000>;
 			interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
@@ -1165,7 +1165,7 @@ sdcc1bam: dma@12402000 {
 			qcom,ee = <0>;
 		};
 
-		sdcc3bam: dma@12182000 {
+		sdcc3bam: dma-controller@12182000 {
 			compatible = "qcom,bam-v1.3.0";
 			reg = <0x12182000 0x8000>;
 			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.25.1