[PATCH v2 0/5] use extended audio dmac register

[PATCH v2 0/5] use extended audio dmac register

[Jiada Wang]

According to user reference manual for R-CAR H3, M3-W and M3-N SoCs,
in order to access busif4 ~ busif7, extended audio dmac registers
(PDMASAREn, PDMADAREn, PDMACHCREn)
need to be used, rather than basic audio dmac registers
(PDMASARn, PDMADARn, PDMACHCRn)

This patch set updates H3 (= r8a7795), M3-W (= r8a7796) and M3-N (=r8a77965)
to use extended audio dmac registers

R-CAR E3 only has extended register set and is already using it,
rename register set name to indicate this.

---
v2: update rsnd driver to use extended register set when available
    rename R-CAR E3 audio dmac regisetr

v1: initial version

Jiada Wang (5):
  arm64: dts: renesas: r8a7795: add extended audio dmac register
  arm64: dts: renesas: r8a7796: add extended audio dmac register
  arm64: dts: renesas: r8a77965: add extended audio dmac register
  arm64: dts: renesas: r8a77990: rename audio dmac register
  ASoC: rsnd: dma: use extended audio dmac registers when available

 arch/arm64/boot/dts/renesas/r8a7795.dtsi  | 5 +++--
 arch/arm64/boot/dts/renesas/r8a7796.dtsi  | 5 +++--
 arch/arm64/boot/dts/renesas/r8a77965.dtsi | 5 +++--
 arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 ++--
 sound/soc/sh/rcar/dma.c                   | 5 ++++-
 5 files changed, 15 insertions(+), 9 deletions(-)

-- 
2.19.2

[PATCH v2 1/5] arm64: dts: renesas: r8a7795: add extended audio dmac register

[Jiada Wang]

Basic audio dmac register only supports busif from 0 to 3,
in order to use busif4 ~ busif7, extended audio dmac register
need to be used.

This patch adds extended audio dmac register with name "extaudmapp".

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index abeac3059383..28d6b73428b1 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -1836,8 +1836,9 @@
 				<0 0xec5a0000 0 0x100>,  /* ADG */
 				<0 0xec540000 0 0x1000>, /* SSIU */
 				<0 0xec541000 0 0x280>,  /* SSI */
-				<0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
-			reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+				<0 0xec740000 0 0x200>,  /* Audio DMAC peri peri*/
+				<0 0xec760000 0 0x200>;  /* Extended Audio DMAC peri peri */
+			reg-names = "scu", "adg", "ssiu", "ssi", "audmapp", "extaudmapp";
 
 			clocks = <&cpg CPG_MOD 1005>,
 				 <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-- 
2.19.2

[PATCH v2 2/5] arm64: dts: renesas: r8a7796: add extended audio dmac register

[Jiada Wang]

Basic audio dmac register only supports busif from 0 to 3,
in order to use busif4 ~ busif7, extended audio dmac register
need to be used

This patch adds extended audio dmac register with name "extaudmapp".

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index cdf784899cf8..761305199f17 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -1775,8 +1775,9 @@
 				<0 0xec5a0000 0 0x100>,  /* ADG */
 				<0 0xec540000 0 0x1000>, /* SSIU */
 				<0 0xec541000 0 0x280>,  /* SSI */
-				<0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
-			reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+				<0 0xec740000 0 0x200>,  /* Audio DMAC peri peri*/
+				<0 0xec760000 0 0x200>;  /* Extended Audio DMAC peri peri*/
+			reg-names = "scu", "adg", "ssiu", "ssi", "audmapp", "extaudmapp";
 
 			clocks = <&cpg CPG_MOD 1005>,
 				 <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-- 
2.19.2

[PATCH v2 3/5] arm64: dts: renesas: r8a77965: add extended audio dmac register

[Jiada Wang]

Basic audio dmac register only supports busif from 0 to 3,
in order to use busif4 ~ busif7, extended audio dmac register
need to be used

This patch adds extended audio dmac register with name "extaudmapp".

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 arch/arm64/boot/dts/renesas/r8a77965.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
index 9763d108e183..25c6f386924b 100644
--- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi
@@ -1461,8 +1461,9 @@
 				<0 0xec5a0000 0 0x100>,  /* ADG */
 				<0 0xec540000 0 0x1000>, /* SSIU */
 				<0 0xec541000 0 0x280>,  /* SSI */
-				<0 0xec740000 0 0x200>;  /* Audio DMAC peri peri*/
-			reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+				<0 0xec740000 0 0x200>,  /* Audio DMAC peri peri*/
+				<0 0xec760000 0 0x200>;  /* Extended Audio DMAC peri peri*/
+			reg-names = "scu", "adg", "ssiu", "ssi", "audmapp", "extaudmapp";
 
 			clocks = <&cpg CPG_MOD 1005>,
 				 <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-- 
2.19.2

[PATCH v2 4/5] arm64: dts: renesas: r8a77990: rename audio dmac register

[Jiada Wang]

audio dmac register used by R-Car E3 is extended audio dmac
register, so rename it to 'extaudmapp'

Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
 arch/arm64/boot/dts/renesas/r8a77990.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
index a69faa60ea4d..a97b1376ef9b 100644
--- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi
@@ -1211,8 +1211,8 @@
 				<0 0xec5a0000 0 0x100>,  /* ADG */
 				<0 0xec540000 0 0x1000>, /* SSIU */
 				<0 0xec541000 0 0x280>,  /* SSI */
-				<0 0xec760000 0 0x200>;  /* Audio DMAC peri peri*/
-			reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
+				<0 0xec760000 0 0x200>;  /* Extended Audio DMAC peri peri*/
+			reg-names = "scu", "adg", "ssiu", "ssi", "extaudmapp";
 
 			clocks = <&cpg CPG_MOD 1005>,
 				 <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>,
-- 
2.19.2