* [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT
@ 2014-10-31 8:01 Kuninori Morimoto
2014-11-03 10:19 ` Geert Uytterhoeven
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2014-10-31 8:01 UTC (permalink / raw)
To: linux-sh
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Instantiate the two Audio DMA controllers in the r8a7791 device tree.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
arch/arm/boot/dts/r8a7791.dtsi | 63 +++++++++++++++++++++++++++--
include/dt-bindings/clock/r8a7791-clock.h | 2 +
2 files changed, 62 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 828b4c5..31f65f8 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -301,6 +301,62 @@
dma-channels = <15>;
};
+ audma0: dma-contorller@ec700000 {
+ compatible = "renesas,rcar-dmac";
+ reg = <0 0xec700000 0 0x10000>;
+ interrupts = <0 346 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>;
+ interrupt-names = "error",
+ "ch0", "ch1", "ch2", "ch3",
+ "ch4", "ch5", "ch6", "ch7",
+ "ch8", "ch9", "ch10", "ch11",
+ "ch12";
+ clocks = <&mstp5_clks R8A7791_CLK_AUDIO_DMAC0>;
+ clock-names = "fck";
+ #dma-cells = <1>;
+ dma-channels = <13>;
+ };
+
+ audma1: dma-controller@ec720000 {
+ compatible = "renesas,rcar-dmac";
+ reg = <0 0xec720000 0 0x10000>;
+ interrupts = <0 347 IRQ_TYPE_LEVEL_HIGH
+ 0 333 IRQ_TYPE_LEVEL_HIGH
+ 0 334 IRQ_TYPE_LEVEL_HIGH
+ 0 335 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>;
+ interrupt-names = "error",
+ "ch0", "ch1", "ch2", "ch3",
+ "ch4", "ch5", "ch6", "ch7",
+ "ch8", "ch9", "ch10", "ch11",
+ "ch12";
+ clocks = <&mstp5_clks R8A7791_CLK_AUDIO_DMAC1>;
+ clock-names = "fck";
+ #dma-cells = <1>;
+ dma-channels = <13>;
+ };
+
/* The memory map in the User's Manual maps the cores to bus numbers */
i2c0: i2c@e6508000 {
#address-cells = <1>;
@@ -1059,10 +1115,11 @@
mstp5_clks: mstp5_clks@e6150144 {
compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
- clocks = <&extal_clk>, <&p_clk>;
+ clocks = <&hp_clk>, <&hp_clk>, <&extal_clk>, <&p_clk>;
#clock-cells = <1>;
- renesas,clock-indices = <R8A7791_CLK_THERMAL R8A7791_CLK_PWM>;
- clock-output-names = "thermal", "pwm";
+ renesas,clock-indices = <R8A7791_CLK_AUDIO_DMAC0 R8A7791_CLK_AUDIO_DMAC1
+ R8A7791_CLK_THERMAL R8A7791_CLK_PWM>;
+ clock-output-names = "audmac0", "audamc1", "thermal", "pwm";
};
mstp7_clks: mstp7_clks@e615014c {
compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index dcececd..3ea2bbc 100644
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -69,6 +69,8 @@
#define R8A7791_CLK_USBDMAC1 31
/* MSTP5 */
+#define R8A7791_CLK_AUDIO_DMAC1 1
+#define R8A7791_CLK_AUDIO_DMAC0 2
#define R8A7791_CLK_THERMAL 22
#define R8A7791_CLK_PWM 23
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT
2014-10-31 8:01 [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT Kuninori Morimoto
@ 2014-11-03 10:19 ` Geert Uytterhoeven
2014-11-03 23:30 ` Simon Horman
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Geert Uytterhoeven @ 2014-11-03 10:19 UTC (permalink / raw)
To: linux-sh
On Fri, Oct 31, 2014 at 9:01 AM, Kuninori Morimoto
<kuninori.morimoto.gx@gmail.com> wrote:
> --- a/arch/arm/boot/dts/r8a7791.dtsi
> +++ b/arch/arm/boot/dts/r8a7791.dtsi
> @@ -301,6 +301,62 @@
> dma-channels = <15>;
> };
>
> + audma0: dma-contorller@ec700000 {
dma-controller
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT
2014-10-31 8:01 [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT Kuninori Morimoto
2014-11-03 10:19 ` Geert Uytterhoeven
@ 2014-11-03 23:30 ` Simon Horman
2014-11-03 23:39 ` Simon Horman
2014-11-04 2:15 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-11-03 23:30 UTC (permalink / raw)
To: linux-sh
On Mon, Nov 03, 2014 at 11:19:59AM +0100, Geert Uytterhoeven wrote:
> On Fri, Oct 31, 2014 at 9:01 AM, Kuninori Morimoto
> <kuninori.morimoto.gx@gmail.com> wrote:
> > --- a/arch/arm/boot/dts/r8a7791.dtsi
> > +++ b/arch/arm/boot/dts/r8a7791.dtsi
> > @@ -301,6 +301,62 @@
> > dma-channels = <15>;
> > };
> >
> > + audma0: dma-contorller@ec700000 {
>
> dma-controller
Morimoto-san, please consider making an incremental patch for this.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT
2014-10-31 8:01 [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT Kuninori Morimoto
2014-11-03 10:19 ` Geert Uytterhoeven
2014-11-03 23:30 ` Simon Horman
@ 2014-11-03 23:39 ` Simon Horman
2014-11-04 2:15 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-11-03 23:39 UTC (permalink / raw)
To: linux-sh
On Tue, Nov 04, 2014 at 08:30:41AM +0900, Simon Horman wrote:
> On Mon, Nov 03, 2014 at 11:19:59AM +0100, Geert Uytterhoeven wrote:
> > On Fri, Oct 31, 2014 at 9:01 AM, Kuninori Morimoto
> > <kuninori.morimoto.gx@gmail.com> wrote:
> > > --- a/arch/arm/boot/dts/r8a7791.dtsi
> > > +++ b/arch/arm/boot/dts/r8a7791.dtsi
> > > @@ -301,6 +301,62 @@
> > > dma-channels = <15>;
> > > };
> > >
> > > + audma0: dma-contorller@ec700000 {
> >
> > dma-controller
>
> Morimoto-san, please consider making an incremental patch for this.
Sorry, ignore that.
For some reason I thought that I had picked up this series.
Please roll any updates into a fresh version of the series :)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT
2014-10-31 8:01 [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT Kuninori Morimoto
` (2 preceding siblings ...)
2014-11-03 23:39 ` Simon Horman
@ 2014-11-04 2:15 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2014-11-04 2:15 UTC (permalink / raw)
To: linux-sh
Hi Simon
> > > > --- a/arch/arm/boot/dts/r8a7791.dtsi
> > > > +++ b/arch/arm/boot/dts/r8a7791.dtsi
> > > > @@ -301,6 +301,62 @@
> > > > dma-channels = <15>;
> > > > };
> > > >
> > > > + audma0: dma-contorller@ec700000 {
> > >
> > > dma-controller
> >
> > Morimoto-san, please consider making an incremental patch for this.
>
> Sorry, ignore that.
> For some reason I thought that I had picked up this series.
> Please roll any updates into a fresh version of the series :)
Done.
I sent v3 patch-set which fixed above
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-11-04 2:15 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-31 8:01 [PATCH 03/12] ARM: shmobile: r8a7791: Add Audio DMAC devices to DT Kuninori Morimoto
2014-11-03 10:19 ` Geert Uytterhoeven
2014-11-03 23:30 ` Simon Horman
2014-11-03 23:39 ` Simon Horman
2014-11-04 2:15 ` Kuninori Morimoto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox