Skip to contentSkip to conversation

ARM: shmobile: r8a7795: Hack up SYS-DMAC0 support

PATCH In review Magnus Damm 3 participants 5 messages Dec 15, 2015 – Dec 17, 2015

Subsystems (3)
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

PATCH 2/3 ARM: shmobile: r8a7795: Hack up SYS-DMAC0 support

From: Magnus Damm <[email protected]>

This hooks up SYS-DMAC0 as r8a7795 device node. Note that the generic compat string is used, this should be replaced by SoC-specific compat string. Not for upstream merge.

---

 arch/arm64/boot/dts/renesas/r8a7795.dtsi |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +29 -1
@@ -295,7 +295,35 @@
 		};
 
 		dmac0: dma-controller@e6700000 {
-			/* Empty node for now */
+			compatible = "renesas,rcar-dmac";
+			reg = <0 0xe6700000 0 0x10000>;
+			interrupts =	<0 119 IRQ_TYPE_LEVEL_HIGH
+					 0 200 IRQ_TYPE_LEVEL_HIGH
+					 0 201 IRQ_TYPE_LEVEL_HIGH
+					 0 202 IRQ_TYPE_LEVEL_HIGH
+					 0 203 IRQ_TYPE_LEVEL_HIGH
+					 0 204 IRQ_TYPE_LEVEL_HIGH
+					 0 205 IRQ_TYPE_LEVEL_HIGH
+					 0 206 IRQ_TYPE_LEVEL_HIGH
+					 0 207 IRQ_TYPE_LEVEL_HIGH
+					 0 208 IRQ_TYPE_LEVEL_HIGH
+					 0 209 IRQ_TYPE_LEVEL_HIGH
+					 0 210 IRQ_TYPE_LEVEL_HIGH
+					 0 211 IRQ_TYPE_LEVEL_HIGH
+					 0 212 IRQ_TYPE_LEVEL_HIGH
+					 0 213 IRQ_TYPE_LEVEL_HIGH
+					 0 214 IRQ_TYPE_LEVEL_HIGH
+					 0 215 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "error",
+					"ch0", "ch1", "ch2", "ch3",
+					"ch4", "ch5", "ch6", "ch7",
+					"ch8", "ch9", "ch10", "ch11",
+					"ch12", "ch13", "ch14", "ch15";
+			clocks = <&cpg CPG_MOD 219>;
+			clock-names = "fck";
+			power-domains = <&cpg>;
+			#dma-cells = <1>;
+			dma-channels = <16>;
 		};
 
 		dmac1: dma-controller@e7300000 {
#1 lore raw
Quoted 15 lines · Magnus Damm

From: Magnus Damm <[email protected]>

This hooks up SYS-DMAC0 as r8a7795 device node. Note that the generic compat string is used, this should be replaced by SoC-specific compat string. Not for upstream merge.

---

 arch/arm64/boot/dts/renesas/r8a7795.dtsi |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

arch/arm64/boot/dts/renesas/r8a7795.dtsi 2015-11-10 20:48:56.410513000 +0900 line 300

Quoted 7 lines
arch/arm64/boot/dts/renesas/r8a7795.dtsi 2015-11-10 20:48:56.410513000 +0900 renamed from arch/arm64/boot/dts/renesas/r8a7795.dtsi +3 -1
@@ -295,7 +295,35 @@
                };
 
                dmac0: dma-controller@e6700000 {
-                       /* Empty node for now */
+                       compatible = "renesas,rcar-dmac";
+                       reg = <0 0xe6700000 0 0x10000>;
+                       interrupts =    <0 119 IRQ_TYPE_LEVEL_HIGH

GIC_SPI

(we should fix up all interrupts properties in R-Car Gen2 DTSes, too)

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

#2 lore raw
In reply to Magnus Damm
Quoted 26 lines · Geert Uytterhoeven
Quoted 15 lines · Magnus Damm

From: Magnus Damm <[email protected]>

This hooks up SYS-DMAC0 as r8a7795 device node. Note that the generic compat string is used, this should be replaced by SoC-specific compat string. Not for upstream merge.

---

 arch/arm64/boot/dts/renesas/r8a7795.dtsi |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

arch/arm64/boot/dts/renesas/r8a7795.dtsi 2015-11-10 20:48:56.410513000 +0900 line 300

Quoted 7 lines
arch/arm64/boot/dts/renesas/r8a7795.dtsi 2015-11-10 20:48:56.410513000 +0900 renamed from arch/arm64/boot/dts/renesas/r8a7795.dtsi +3 -1
@@ -295,7 +295,35 @@
                };
 
                dmac0: dma-controller@e6700000 {
-                       /* Empty node for now */
+                       compatible = "renesas,rcar-dmac";
+                       reg = <0 0xe6700000 0 0x10000>;
+                       interrupts =    <0 119 IRQ_TYPE_LEVEL_HIGH

GIC_SPI

Quoted 1 line

(we should fix up all interrupts properties in R-Car Gen2 DTSes, too)

Can I clarify that the idea is to substitute the first cell of the value of interrupt properties as follows:
* s/0/GIC_SPI/
* s/1/GIC_PPI/

If so, I can add this to my (long) integration todo list. I'm also quite happy for someone else to handle this.

#3 lore raw
In reply to Magnus Damm

Hi Simon,

Quoted 10 lines · Simon Horman
Quoted 5 lines
Quoted 1 line

+ interrupts = <0 119 IRQ_TYPE_LEVEL_HIGH

GIC_SPI

(we should fix up all interrupts properties in R-Car Gen2 DTSes, too)

Can I clarify that the idea is to substitute the first cell of the value of interrupt properties as follows:
* s/0/GIC_SPI/
* s/1/GIC_PPI/

Indeed.

Quoted 2 lines

If so, I can add this to my (long) integration todo list. I'm also quite happy for someone else to handle this.

Thanks!

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

author maintainer
#4 lore raw
In reply to Magnus Damm
Quoted 26 lines · Geert Uytterhoeven
Quoted 15 lines · Magnus Damm

From: Magnus Damm <[email protected]>

This hooks up SYS-DMAC0 as r8a7795 device node. Note that the generic compat string is used, this should be replaced by SoC-specific compat string. Not for upstream merge.

---

 arch/arm64/boot/dts/renesas/r8a7795.dtsi |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

arch/arm64/boot/dts/renesas/r8a7795.dtsi 2015-11-10 20:48:56.410513000 +0900 line 300

Quoted 7 lines
arch/arm64/boot/dts/renesas/r8a7795.dtsi 2015-11-10 20:48:56.410513000 +0900 renamed from arch/arm64/boot/dts/renesas/r8a7795.dtsi +3 -1
@@ -295,7 +295,35 @@
                };
 
                dmac0: dma-controller@e6700000 {
-                       /* Empty node for now */
+                       compatible = "renesas,rcar-dmac";
+                       reg = <0 0xe6700000 0 0x10000>;
+                       interrupts =    <0 119 IRQ_TYPE_LEVEL_HIGH

GIC_SPI

Quoted 1 line

(we should fix up all interrupts properties in R-Car Gen2 DTSes, too)

Thanks, totally agree!

/ magnus