* [PATCH 1/6] ARM: shmobile: r8a7790: add reg-names for sound
2015-03-19 2:15 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Simon Horman
@ 2015-03-19 2:15 ` Simon Horman
2015-03-19 2:15 ` [PATCH 2/6] ARM: shmobile: r8a7791: " Simon Horman
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-03-19 2:15 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Rensas R-Car sound driver supports reg-names.
Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index b320252..2041ec7 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1461,6 +1461,8 @@
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
<0 0xec541000 0 0x1280>; /* SSI */
+ reg-names = "scu", "adg", "ssiu", "ssi";
+
clocks = <&mstp10_clks R8A7790_CLK_SSI_ALL>,
<&mstp10_clks R8A7790_CLK_SSI9>, <&mstp10_clks R8A7790_CLK_SSI8>,
<&mstp10_clks R8A7790_CLK_SSI7>, <&mstp10_clks R8A7790_CLK_SSI6>,
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/6] ARM: shmobile: r8a7791: add reg-names for sound
2015-03-19 2:15 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Simon Horman
2015-03-19 2:15 ` [PATCH 1/6] ARM: shmobile: r8a7790: add reg-names for sound Simon Horman
@ 2015-03-19 2:15 ` Simon Horman
2015-03-19 2:15 ` [PATCH 3/6] ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver Simon Horman
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-03-19 2:15 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Rensas R-Car sound driver supports reg-names.
Let's use it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index e899f79..8631e02 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1504,6 +1504,8 @@
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
<0 0xec541000 0 0x1280>; /* SSI */
+ reg-names = "scu", "adg", "ssiu", "ssi";
+
clocks = <&mstp10_clks R8A7791_CLK_SSI_ALL>,
<&mstp10_clks R8A7791_CLK_SSI9>, <&mstp10_clks R8A7791_CLK_SSI8>,
<&mstp10_clks R8A7791_CLK_SSI7>, <&mstp10_clks R8A7791_CLK_SSI6>,
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1
@ 2015-03-19 2:15 Simon Horman
2015-03-19 2:15 ` [PATCH 1/6] ARM: shmobile: r8a7790: add reg-names for sound Simon Horman
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Simon Horman @ 2015-03-19 2:15 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these third round of Renesas ARM based SoC DT updates for v4.1.
This pull request is based on the previous round of
such requests, tagged as renesas-dt2-for-v4.1,
which you have already pulled.
The following changes since commit 90ca409a1e6b9b72d1b6ae716cd7a63335fd0e87:
ARM: shmobile: ape6evm dts: Configure the custom switch as wake-up source (2015-03-07 10:07:30 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v4.1
for you to fetch changes up to 63573339e7698503bfeaef3bb0c444ffc98e45a0:
ARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSI (2015-03-11 09:40:30 +0900)
----------------------------------------------------------------
Third Round of Renesas ARM Based SoC DT Updates for v4.1
* Add DMA sound support to r8a7791 and r8a7790 SoCs
----------------------------------------------------------------
Kuninori Morimoto (6):
ARM: shmobile: r8a7790: add reg-names for sound
ARM: shmobile: r8a7791: add reg-names for sound
ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver
ARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driver
ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI
ARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSI
arch/arm/boot/dts/r8a7790.dtsi | 142 ++++++++++++++++++++++++++++++++---------
arch/arm/boot/dts/r8a7791.dtsi | 142 ++++++++++++++++++++++++++++++++---------
2 files changed, 224 insertions(+), 60 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/6] ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver
2015-03-19 2:15 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Simon Horman
2015-03-19 2:15 ` [PATCH 1/6] ARM: shmobile: r8a7790: add reg-names for sound Simon Horman
2015-03-19 2:15 ` [PATCH 2/6] ARM: shmobile: r8a7791: " Simon Horman
@ 2015-03-19 2:15 ` Simon Horman
2015-03-19 2:15 ` [PATCH 4/6] ARM: shmobile: r8a7791: " Simon Horman
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-03-19 2:15 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Audio DMAC peri peri is no longer DMAEngine. it is supported by
sound driver. this patch enable it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 2041ec7..48d11e0e 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -370,13 +370,6 @@
dma-channels = <13>;
};
- audmapp: dma-controller at ec740000 {
- compatible = "renesas,rcar-audmapp";
- #dma-cells = <1>;
-
- reg = <0 0xec740000 0 0x200>;
- };
-
i2c0: i2c at e6508000 {
#address-cells = <1>;
#size-cells = <0>;
@@ -1460,8 +1453,9 @@
reg = <0 0xec500000 0 0x1000>, /* SCU */
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
- <0 0xec541000 0 0x1280>; /* SSI */
- reg-names = "scu", "adg", "ssiu", "ssi";
+ <0 0xec541000 0 0x1280>, /* SSI */
+ <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/
+ reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
clocks = <&mstp10_clks R8A7790_CLK_SSI_ALL>,
<&mstp10_clks R8A7790_CLK_SSI9>, <&mstp10_clks R8A7790_CLK_SSI8>,
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/6] ARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driver
2015-03-19 2:15 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Simon Horman
` (2 preceding siblings ...)
2015-03-19 2:15 ` [PATCH 3/6] ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver Simon Horman
@ 2015-03-19 2:15 ` Simon Horman
2015-03-19 2:15 ` [PATCH 5/6] ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI Simon Horman
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-03-19 2:15 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Audio DMAC peri peri is no longer DMAEngine. it is supported by
sound driver. this patch enable it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 8631e02..a697b94 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -357,13 +357,6 @@
dma-channels = <13>;
};
- audmapp: dma-controller at ec740000 {
- compatible = "renesas,rcar-audmapp";
- #dma-cells = <1>;
-
- reg = <0 0xec740000 0 0x200>;
- };
-
/* The memory map in the User's Manual maps the cores to bus numbers */
i2c0: i2c at e6508000 {
#address-cells = <1>;
@@ -1503,8 +1496,9 @@
reg = <0 0xec500000 0 0x1000>, /* SCU */
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
- <0 0xec541000 0 0x1280>; /* SSI */
- reg-names = "scu", "adg", "ssiu", "ssi";
+ <0 0xec541000 0 0x1280>, /* SSI */
+ <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/
+ reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
clocks = <&mstp10_clks R8A7791_CLK_SSI_ALL>,
<&mstp10_clks R8A7791_CLK_SSI9>, <&mstp10_clks R8A7791_CLK_SSI8>,
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/6] ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI
2015-03-19 2:15 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Simon Horman
` (3 preceding siblings ...)
2015-03-19 2:15 ` [PATCH 4/6] ARM: shmobile: r8a7791: " Simon Horman
@ 2015-03-19 2:15 ` Simon Horman
2015-03-19 2:15 ` [PATCH 6/6] ARM: shmobile: r8a7791: " Simon Horman
2015-04-02 0:54 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Olof Johansson
6 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-03-19 2:15 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch adds Audio DMAC (= rcar-dmac) entry for sound
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 130 ++++++++++++++++++++++++++++++++++-------
1 file changed, 108 insertions(+), 22 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 48d11e0e..4bb2f4c 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1481,34 +1481,120 @@
status = "disabled";
rcar_sound,dvc {
- dvc0: dvc at 0 { };
- dvc1: dvc at 1 { };
+ dvc0: dvc at 0 {
+ dmas = <&audma0 0xbc>;
+ dma-names = "tx";
+ };
+ dvc1: dvc at 1 {
+ dmas = <&audma0 0xbe>;
+ dma-names = "tx";
+ };
};
rcar_sound,src {
- src0: src at 0 { interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>; };
- src1: src at 1 { interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>; };
- src2: src at 2 { interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>; };
- src3: src at 3 { interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>; };
- src4: src at 4 { interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>; };
- src5: src at 5 { interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>; };
- src6: src at 6 { interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>; };
- src7: src at 7 { interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>; };
- src8: src at 8 { interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>; };
- src9: src at 9 { interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>; };
+ src0: src at 0 {
+ interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x85>, <&audma1 0x9a>;
+ dma-names = "rx", "tx";
+ };
+ src1: src at 1 {
+ interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x87>, <&audma1 0x9c>;
+ dma-names = "rx", "tx";
+ };
+ src2: src at 2 {
+ interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x89>, <&audma1 0x9e>;
+ dma-names = "rx", "tx";
+ };
+ src3: src at 3 {
+ interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x8b>, <&audma1 0xa0>;
+ dma-names = "rx", "tx";
+ };
+ src4: src at 4 {
+ interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x8d>, <&audma1 0xb0>;
+ dma-names = "rx", "tx";
+ };
+ src5: src at 5 {
+ interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x8f>, <&audma1 0xb2>;
+ dma-names = "rx", "tx";
+ };
+ src6: src at 6 {
+ interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x91>, <&audma1 0xb4>;
+ dma-names = "rx", "tx";
+ };
+ src7: src at 7 {
+ interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x93>, <&audma1 0xb6>;
+ dma-names = "rx", "tx";
+ };
+ src8: src at 8 {
+ interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x95>, <&audma1 0xb8>;
+ dma-names = "rx", "tx";
+ };
+ src9: src at 9 {
+ interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x97>, <&audma1 0xba>;
+ dma-names = "rx", "tx";
+ };
};
rcar_sound,ssi {
- ssi0: ssi at 0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };
- ssi1: ssi at 1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };
- ssi2: ssi at 2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };
- ssi3: ssi at 3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };
- ssi4: ssi at 4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };
- ssi5: ssi at 5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };
- ssi6: ssi at 6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };
- ssi7: ssi at 7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };
- ssi8: ssi at 8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };
- ssi9: ssi at 9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi0: ssi at 0 {
+ interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi1: ssi at 1 {
+ interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi2: ssi at 2 {
+ interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi3: ssi at 3 {
+ interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi4: ssi at 4 {
+ interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi5: ssi at 5 {
+ interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi6: ssi at 6 {
+ interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi7: ssi at 7 {
+ interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi8: ssi at 8 {
+ interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi9: ssi at 9 {
+ interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
};
};
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/6] ARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSI
2015-03-19 2:15 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Simon Horman
` (4 preceding siblings ...)
2015-03-19 2:15 ` [PATCH 5/6] ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI Simon Horman
@ 2015-03-19 2:15 ` Simon Horman
2015-04-02 0:54 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Olof Johansson
6 siblings, 0 replies; 8+ messages in thread
From: Simon Horman @ 2015-03-19 2:15 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch adds Audio DMAC (= rcar-dmac) entry for sound
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 130 ++++++++++++++++++++++++++++++++++-------
1 file changed, 108 insertions(+), 22 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index a697b94..4696062 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1524,34 +1524,120 @@
status = "disabled";
rcar_sound,dvc {
- dvc0: dvc at 0 { };
- dvc1: dvc at 1 { };
+ dvc0: dvc at 0 {
+ dmas = <&audma0 0xbc>;
+ dma-names = "tx";
+ };
+ dvc1: dvc at 1 {
+ dmas = <&audma0 0xbe>;
+ dma-names = "tx";
+ };
};
rcar_sound,src {
- src0: src at 0 { interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>; };
- src1: src at 1 { interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>; };
- src2: src at 2 { interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>; };
- src3: src at 3 { interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>; };
- src4: src at 4 { interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>; };
- src5: src at 5 { interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>; };
- src6: src at 6 { interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>; };
- src7: src at 7 { interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>; };
- src8: src at 8 { interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>; };
- src9: src at 9 { interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>; };
+ src0: src at 0 {
+ interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x85>, <&audma1 0x9a>;
+ dma-names = "rx", "tx";
+ };
+ src1: src at 1 {
+ interrupts = <0 353 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x87>, <&audma1 0x9c>;
+ dma-names = "rx", "tx";
+ };
+ src2: src at 2 {
+ interrupts = <0 354 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x89>, <&audma1 0x9e>;
+ dma-names = "rx", "tx";
+ };
+ src3: src at 3 {
+ interrupts = <0 355 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x8b>, <&audma1 0xa0>;
+ dma-names = "rx", "tx";
+ };
+ src4: src at 4 {
+ interrupts = <0 356 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x8d>, <&audma1 0xb0>;
+ dma-names = "rx", "tx";
+ };
+ src5: src at 5 {
+ interrupts = <0 357 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x8f>, <&audma1 0xb2>;
+ dma-names = "rx", "tx";
+ };
+ src6: src at 6 {
+ interrupts = <0 358 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x91>, <&audma1 0xb4>;
+ dma-names = "rx", "tx";
+ };
+ src7: src at 7 {
+ interrupts = <0 359 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x93>, <&audma1 0xb6>;
+ dma-names = "rx", "tx";
+ };
+ src8: src at 8 {
+ interrupts = <0 360 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x95>, <&audma1 0xb8>;
+ dma-names = "rx", "tx";
+ };
+ src9: src at 9 {
+ interrupts = <0 361 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x97>, <&audma1 0xba>;
+ dma-names = "rx", "tx";
+ };
};
rcar_sound,ssi {
- ssi0: ssi at 0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };
- ssi1: ssi at 1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };
- ssi2: ssi at 2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };
- ssi3: ssi at 3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };
- ssi4: ssi at 4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };
- ssi5: ssi at 5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };
- ssi6: ssi at 6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };
- ssi7: ssi at 7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };
- ssi8: ssi at 8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };
- ssi9: ssi at 9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi0: ssi at 0 {
+ interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi1: ssi at 1 {
+ interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi2: ssi at 2 {
+ interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi3: ssi at 3 {
+ interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi4: ssi at 4 {
+ interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi5: ssi at 5 {
+ interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi6: ssi at 6 {
+ interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi7: ssi at 7 {
+ interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi8: ssi at 8 {
+ interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
+ ssi9: ssi at 9 {
+ interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>;
+ dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
+ dma-names = "rx", "tx", "rxu", "txu";
+ };
};
};
};
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1
2015-03-19 2:15 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Simon Horman
` (5 preceding siblings ...)
2015-03-19 2:15 ` [PATCH 6/6] ARM: shmobile: r8a7791: " Simon Horman
@ 2015-04-02 0:54 ` Olof Johansson
6 siblings, 0 replies; 8+ messages in thread
From: Olof Johansson @ 2015-04-02 0:54 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Mar 19, 2015 at 11:15:21AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these third round of Renesas ARM based SoC DT updates for v4.1.
>
> This pull request is based on the previous round of
> such requests, tagged as renesas-dt2-for-v4.1,
> which you have already pulled.
>
>
> The following changes since commit 90ca409a1e6b9b72d1b6ae716cd7a63335fd0e87:
>
> ARM: shmobile: ape6evm dts: Configure the custom switch as wake-up source (2015-03-07 10:07:30 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v4.1
>
> for you to fetch changes up to 63573339e7698503bfeaef3bb0c444ffc98e45a0:
>
> ARM: shmobile: r8a7791: sound enables Audio DMAC entry on DTSI (2015-03-11 09:40:30 +0900)
Merged, thanks.
-Olof
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-04-02 0:54 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-19 2:15 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Simon Horman
2015-03-19 2:15 ` [PATCH 1/6] ARM: shmobile: r8a7790: add reg-names for sound Simon Horman
2015-03-19 2:15 ` [PATCH 2/6] ARM: shmobile: r8a7791: " Simon Horman
2015-03-19 2:15 ` [PATCH 3/6] ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver Simon Horman
2015-03-19 2:15 ` [PATCH 4/6] ARM: shmobile: r8a7791: " Simon Horman
2015-03-19 2:15 ` [PATCH 5/6] ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI Simon Horman
2015-03-19 2:15 ` [PATCH 6/6] ARM: shmobile: r8a7791: " Simon Horman
2015-04-02 0:54 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Olof Johansson
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).