[PATCH 03/18 v3] arm64: renesas: r8a7795: add AUDIO_DMAC support

[PATCH 03/18 v3] arm64: renesas: r8a7795: add AUDIO_DMAC support

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2 -> v3

 - add power-domains
 - add Geert's Reviewed-by

 arch/arm64/boot/dts/renesas/r8a7795.dtsi  | 75 +++++++++++++++++++++++++++++++
 include/dt-bindings/clock/r8a7795-clock.h |  2 +
 2 files changed, 77 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 3a82eba..a87c4be 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -423,6 +423,17 @@
 					clock-indices = <R8A7795_CLK_SCIF2>;
 				};
 
+				mstp5_clks: mstp5_clks@e6150144 {
+					compatible = "renesas,r8a7795-mstp-clocks",
+						     "renesas,cpg-mstp-clocks";
+					reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
+					clocks = <&s3d4_clk>, <&s3d4_clk>;
+					#clock-cells = <1>;
+					clock-indices = <
+						R8A7795_CLK_AUDIO_DMAC0 R8A7795_CLK_AUDIO_DMAC1
+					>;
+				};
+
 				mstp6_clks: mstp6@e61501c0 {
 					compatible = "renesas,r8a7795-mstp-clocks",
 						     "renesas,cpg-mstp-clocks";
@@ -493,6 +504,70 @@
 			};
 		};
 
+		audma0: dma-controller@ec700000 {
+			compatible = "renesas,rcar-dmac";
+			reg = <0 0xec700000 0 0x10000>;
+			interrupts =	<0 350 IRQ_TYPE_LEVEL_HIGH
+					 0 320 IRQ_TYPE_LEVEL_HIGH
+					 0 321 IRQ_TYPE_LEVEL_HIGH
+					 0 322 IRQ_TYPE_LEVEL_HIGH
+					 0 323 IRQ_TYPE_LEVEL_HIGH
+					 0 324 IRQ_TYPE_LEVEL_HIGH
+					 0 325 IRQ_TYPE_LEVEL_HIGH
+					 0 326 IRQ_TYPE_LEVEL_HIGH
+					 0 327 IRQ_TYPE_LEVEL_HIGH
+					 0 328 IRQ_TYPE_LEVEL_HIGH
+					 0 329 IRQ_TYPE_LEVEL_HIGH
+					 0 330 IRQ_TYPE_LEVEL_HIGH
+					 0 331 IRQ_TYPE_LEVEL_HIGH
+					 0 332 IRQ_TYPE_LEVEL_HIGH
+					 0 333 IRQ_TYPE_LEVEL_HIGH
+					 0 334 IRQ_TYPE_LEVEL_HIGH
+					 0 335 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "error",
+					"ch0", "ch1", "ch2", "ch3",
+					"ch4", "ch5", "ch6", "ch7",
+					"ch8", "ch9", "ch10", "ch11",
+					"ch12", "ch13", "ch14", "ch15";
+			clocks = <&mstp5_clks R8A7795_CLK_AUDIO_DMAC0>;
+			power-domains = <&cpg_clocks>;
+			clock-names = "fck";
+			#dma-cells = <1>;
+			dma-channels = <16>;
+		};
+
+		audma1: dma-controller@ec720000 {
+			compatible = "renesas,rcar-dmac";
+			reg = <0 0xec720000 0 0x10000>;
+			interrupts =	<0 351 IRQ_TYPE_LEVEL_HIGH
+					 0 336 IRQ_TYPE_LEVEL_HIGH
+					 0 337 IRQ_TYPE_LEVEL_HIGH
+					 0 338 IRQ_TYPE_LEVEL_HIGH
+					 0 339 IRQ_TYPE_LEVEL_HIGH
+					 0 340 IRQ_TYPE_LEVEL_HIGH
+					 0 341 IRQ_TYPE_LEVEL_HIGH
+					 0 342 IRQ_TYPE_LEVEL_HIGH
+					 0 343 IRQ_TYPE_LEVEL_HIGH
+					 0 344 IRQ_TYPE_LEVEL_HIGH
+					 0 345 IRQ_TYPE_LEVEL_HIGH
+					 0 346 IRQ_TYPE_LEVEL_HIGH
+					 0 347 IRQ_TYPE_LEVEL_HIGH
+					 0 348 IRQ_TYPE_LEVEL_HIGH
+					 0 349 IRQ_TYPE_LEVEL_HIGH
+					 0 382 IRQ_TYPE_LEVEL_HIGH
+					 0 383 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "error",
+					"ch0", "ch1", "ch2", "ch3",
+					"ch4", "ch5", "ch6", "ch7",
+					"ch8", "ch9", "ch10", "ch11",
+					"ch12", "ch13", "ch14", "ch15";
+			clocks = <&mstp5_clks R8A7795_CLK_AUDIO_DMAC1>;
+			power-domains = <&cpg_clocks>;
+			clock-names = "fck";
+			#dma-cells = <1>;
+			dma-channels = <16>;
+		};
+
 		pfc: pfc@e6060000 {
 			compatible = "renesas,pfc-r8a7795";
 			reg = <0 0xe6060000 0 0x50c>;
diff --git a/include/dt-bindings/clock/r8a7795-clock.h b/include/dt-bindings/clock/r8a7795-clock.h
index 881788f..ca370c7 100644
--- a/include/dt-bindings/clock/r8a7795-clock.h
+++ b/include/dt-bindings/clock/r8a7795-clock.h
@@ -32,6 +32,8 @@
 #define R8A7795_CLK_SCIF2		10
 
 /* MSTP5 */
+#define R8A7795_CLK_AUDIO_DMAC0		2
+#define R8A7795_CLK_AUDIO_DMAC1		1
 
 /* MSTP6 */
 #define R8A7795_CLK_VSPD3		20
-- 
1.9.1

Re: [PATCH 03/18 v3] arm64: renesas: r8a7795: add AUDIO_DMAC support

[Geert Uytterhoeven]

Hi Morimoto-san,

On Fri, Sep 18, 2015 at 4:03 AM, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
> --- a/include/dt-bindings/clock/r8a7795-clock.h
> +++ b/include/dt-bindings/clock/r8a7795-clock.h
> @@ -32,6 +32,8 @@
>  #define R8A7795_CLK_SCIF2              10
>
>  /* MSTP5 */
> +#define R8A7795_CLK_AUDIO_DMAC0                2
> +#define R8A7795_CLK_AUDIO_DMAC1                1

Please sort by increasing bit number.

Sorry for missing this before.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

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

Re: [PATCH 03/18 v3] arm64: renesas: r8a7795: add AUDIO_DMAC support

[Kuninori Morimoto]

Hi Geert, Simon

> On Fri, Sep 18, 2015 at 4:03 AM, Kuninori Morimoto
> <kuninori.morimoto.gx@renesas.com> wrote:
> > --- a/include/dt-bindings/clock/r8a7795-clock.h
> > +++ b/include/dt-bindings/clock/r8a7795-clock.h
> > @@ -32,6 +32,8 @@
> >  #define R8A7795_CLK_SCIF2              10
> >
> >  /* MSTP5 */
> > +#define R8A7795_CLK_AUDIO_DMAC0                2
> > +#define R8A7795_CLK_AUDIO_DMAC1                1
> 
> Please sort by increasing bit number.
> 
> Sorry for missing this before.

Thanks

>> Simon

I think this patch is already queued to topic branch.
Is it possible to replace to new patch ?
Or is additional patch better ?

Best regards
---
Kuninori Morimoto

Re: [PATCH 03/18 v3] arm64: renesas: r8a7795: add AUDIO_DMAC support

[Simon Horman]

On Thu, Sep 24, 2015 at 12:04:07AM +0000, Kuninori Morimoto wrote:
> 
> Hi Geert, Simon
> 
> > On Fri, Sep 18, 2015 at 4:03 AM, Kuninori Morimoto
> > <kuninori.morimoto.gx@renesas.com> wrote:
> > > --- a/include/dt-bindings/clock/r8a7795-clock.h
> > > +++ b/include/dt-bindings/clock/r8a7795-clock.h
> > > @@ -32,6 +32,8 @@
> > >  #define R8A7795_CLK_SCIF2              10
> > >
> > >  /* MSTP5 */
> > > +#define R8A7795_CLK_AUDIO_DMAC0                2
> > > +#define R8A7795_CLK_AUDIO_DMAC1                1
> > 
> > Please sort by increasing bit number.
> > 
> > Sorry for missing this before.
> 
> Thanks
> 
> >> Simon
> 
> I think this patch is already queued to topic branch.
> Is it possible to replace to new patch ?
> Or is additional patch better ?

If you only wish to change this one patch then I'm happy to try
to update just one patch.

I am also happy for you to post a new series any time.
If so it would help me if you ordered the patches such that
all the i2c patches are followed by all the sound patches
as per what you can see in the following topic branches in my
renesas tree:

topic/r8a7795-sound-v3
topic/r8a7795-i2c-v3

Basing your series on the latest topic/r8a7795-gpio branch
(currently topic/r8a7795-gpio-v1.rebase) would be even better for me.

Re: [PATCH 03/18 v3] arm64: renesas: r8a7795: add AUDIO_DMAC support

[Kuninori Morimoto]

Hi Simon

> > > <kuninori.morimoto.gx@renesas.com> wrote:
> > > > --- a/include/dt-bindings/clock/r8a7795-clock.h
> > > > +++ b/include/dt-bindings/clock/r8a7795-clock.h
> > > > @@ -32,6 +32,8 @@
> > > >  #define R8A7795_CLK_SCIF2              10
> > > >
> > > >  /* MSTP5 */
> > > > +#define R8A7795_CLK_AUDIO_DMAC0                2
> > > > +#define R8A7795_CLK_AUDIO_DMAC1                1
> > > 
> > > Please sort by increasing bit number.
> > > 
> > > Sorry for missing this before.
> > 
> > Thanks
> > 
> > >> Simon
> > 
> > I think this patch is already queued to topic branch.
> > Is it possible to replace to new patch ?
> > Or is additional patch better ?
> 
> If you only wish to change this one patch then I'm happy to try
> to update just one patch.

Yes, I would like to just 1 patch replace
I will send this patch again

> I am also happy for you to post a new series any time.
> If so it would help me if you ordered the patches such that
> all the i2c patches are followed by all the sound patches
> as per what you can see in the following topic branches in my
> renesas tree:
> 
> topic/r8a7795-sound-v3
> topic/r8a7795-i2c-v3
> 
> Basing your series on the latest topic/r8a7795-gpio branch
> (currently topic/r8a7795-gpio-v1.rebase) would be even better for me.

Re: [PATCH 03/18 v3] arm64: renesas: r8a7795: add AUDIO_DMAC support

[Kuninori Morimoto]

Hi Simon

> > If you only wish to change this one patch then I'm happy to try
> > to update just one patch.
> 
> Yes, I would like to just 1 patch replace
> I will send this patch again
(snip)
> > topic/r8a7795-sound-v3

Next v4 patch will fixup MSTP5 definition order.
It is queued as below on your topic/r8a7795-sound-v3 branch

	e073032d19ba2c49eb588e98bd1cf21b876e2beb
	("arm64: renesas: r8a7795: add AUDIO_DMAC support")

Please replace it

Re: [PATCH 03/18 v3] arm64: renesas: r8a7795: add AUDIO_DMAC support

[Simon Horman]

On Thu, Sep 24, 2015 at 07:18:42AM +0000, Kuninori Morimoto wrote:
> 
> Hi Simon
> 
> > > If you only wish to change this one patch then I'm happy to try
> > > to update just one patch.
> > 
> > Yes, I would like to just 1 patch replace
> > I will send this patch again
> (snip)
> > > topic/r8a7795-sound-v3
> 
> Next v4 patch will fixup MSTP5 definition order.
> It is queued as below on your topic/r8a7795-sound-v3 branch
> 
> 	e073032d19ba2c49eb588e98bd1cf21b876e2beb
> 	("arm64: renesas: r8a7795: add AUDIO_DMAC support")
> 
> Please replace it

Done.

I have left the topic/r8a7795-sound-v3 branch unchanged.
The update is present in the new topic/r8a7795-sound-v3.update branch.