* [PATCH v4] arm64: renesas: r8a7795: add AUDIO_DMAC support
@ 2015-09-24 7:19 Kuninori Morimoto
2015-09-25 1:19 ` Simon Horman
2015-10-05 2:29 ` Simon Horman
0 siblings, 2 replies; 3+ messages in thread
From: Kuninori Morimoto @ 2015-09-24 7:19 UTC (permalink / raw)
To: linux-sh
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>
---
v3 -> v4
- tidyup MSTP5 definition order
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 81bf555..97e93c4 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -415,6 +415,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
+ >;
+ };
+
mstp9_clks: mstp9_clks@e6150994 {
compatible = "renesas,r8a7795-mstp-clocks",
"renesas,cpg-mstp-clocks";
@@ -470,6 +481,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 6c523bb..c17cf56 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_DMAC1 1
+#define R8A7795_CLK_AUDIO_DMAC0 2
/* MSTP7 */
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v4] arm64: renesas: r8a7795: add AUDIO_DMAC support
2015-09-24 7:19 [PATCH v4] arm64: renesas: r8a7795: add AUDIO_DMAC support Kuninori Morimoto
@ 2015-09-25 1:19 ` Simon Horman
2015-10-05 2:29 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2015-09-25 1:19 UTC (permalink / raw)
To: linux-sh
On Thu, Sep 24, 2015 at 07:19:43AM +0000, Kuninori Morimoto wrote:
> 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>
> ---
> v3 -> v4
>
> - tidyup MSTP5 definition order
>
> arch/arm64/boot/dts/renesas/r8a7795.dtsi | 75 +++++++++++++++++++++++++++++++
> include/dt-bindings/clock/r8a7795-clock.h | 2 +
> 2 files changed, 77 insertions(+)
I have left the topic/r8a7795-sound-v3 branch unchanged.
This updated patch is present in the new topic/r8a7795-sound-v3.update branch.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4] arm64: renesas: r8a7795: add AUDIO_DMAC support
2015-09-24 7:19 [PATCH v4] arm64: renesas: r8a7795: add AUDIO_DMAC support Kuninori Morimoto
2015-09-25 1:19 ` Simon Horman
@ 2015-10-05 2:29 ` Simon Horman
1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2015-10-05 2:29 UTC (permalink / raw)
To: linux-sh
On Thu, Sep 24, 2015 at 07:19:43AM +0000, Kuninori Morimoto wrote:
> 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>
Hi,
I have taken the liberty of updating this patch with the following
incremental change from Geert. The result can be found in the
topic/r8a7795-sound-v3.update.rebase branch of my renesas tree.
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 16abf8956c68cb00..e70c3cfe0c025a4d 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -455,6 +455,8 @@
clock-indices = <
R8A7795_CLK_AUDIO_DMAC0 R8A7795_CLK_AUDIO_DMAC1
>;
+ clock-output-names + "audmac0", "audmac1";
};
mstp6_clks: mstp6@e61501c0 {
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-05 2:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-24 7:19 [PATCH v4] arm64: renesas: r8a7795: add AUDIO_DMAC support Kuninori Morimoto
2015-09-25 1:19 ` Simon Horman
2015-10-05 2:29 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).