All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Horman <horms+renesas@verge.net.au>
To: linux-renesas-soc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	Magnus Damm <magnus.damm@gmail.com>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	Simon Horman <horms+renesas@verge.net.au>
Subject: [PATCH 37/44] arm64: dts: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi
Date: Thu, 24 Jan 2019 16:12:31 +0100	[thread overview]
Message-ID: <0ec8e0a879b8d7eacbfbed9a7face8f97f9493a8.1548233325.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1548233325.git.horms+renesas@verge.net.au>

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

Before, BUSIF which is needed for DMA transfer was automatically handled
via SSI, but it cared BUSIF0 only.
Now, rsnd driver can handle BUSIF0-7 (= for Gen3) BUSIF0-3 (= for Gen2)
via SSIU, and it is keeping compatibility.
Thus, BUSIF0 settings via SSI had been kept to avoid git merge timing
issue / git bisect issue, but it is no longer needed.
This patch removes it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index af9605d5db27..a81ed2ba63e7 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2174,53 +2174,53 @@
 			rcar_sound,ssi {
 				ssi0: ssi-0 {
 					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x01>, <&audma1 0x02>;
+					dma-names = "rx", "tx";
 				};
 				ssi1: ssi-1 {
 					 interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x03>, <&audma1 0x04>;
+					dma-names = "rx", "tx";
 				};
 				ssi2: ssi-2 {
 					interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x05>, <&audma1 0x06>;
+					dma-names = "rx", "tx";
 				};
 				ssi3: ssi-3 {
 					interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x07>, <&audma1 0x08>;
+					dma-names = "rx", "tx";
 				};
 				ssi4: ssi-4 {
 					interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x09>, <&audma1 0x0a>;
+					dma-names = "rx", "tx";
 				};
 				ssi5: ssi-5 {
 					interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0b>, <&audma1 0x0c>;
+					dma-names = "rx", "tx";
 				};
 				ssi6: ssi-6 {
 					interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0d>, <&audma1 0x0e>;
+					dma-names = "rx", "tx";
 				};
 				ssi7: ssi-7 {
 					interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0f>, <&audma1 0x10>;
+					dma-names = "rx", "tx";
 				};
 				ssi8: ssi-8 {
 					interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x11>, <&audma1 0x12>;
+					dma-names = "rx", "tx";
 				};
 				ssi9: ssi-9 {
 					interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x13>, <&audma1 0x14>;
+					dma-names = "rx", "tx";
 				};
 			};
 		};
-- 
2.11.0


WARNING: multiple messages have this Message-ID (diff)
From: Simon Horman <horms+renesas@verge.net.au>
To: linux-renesas-soc@vger.kernel.org
Cc: Simon Horman <horms+renesas@verge.net.au>,
	Magnus Damm <magnus.damm@gmail.com>,
	Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 37/44] arm64: dts: renesas: r8a7795: remove BUSIF0 settings from rcar_sound, ssi
Date: Thu, 24 Jan 2019 16:12:31 +0100	[thread overview]
Message-ID: <0ec8e0a879b8d7eacbfbed9a7face8f97f9493a8.1548233325.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1548233325.git.horms+renesas@verge.net.au>

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

Before, BUSIF which is needed for DMA transfer was automatically handled
via SSI, but it cared BUSIF0 only.
Now, rsnd driver can handle BUSIF0-7 (= for Gen3) BUSIF0-3 (= for Gen2)
via SSIU, and it is keeping compatibility.
Thus, BUSIF0 settings via SSI had been kept to avoid git merge timing
issue / git bisect issue, but it is no longer needed.
This patch removes it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 40 ++++++++++++++++----------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index af9605d5db27..a81ed2ba63e7 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2174,53 +2174,53 @@
 			rcar_sound,ssi {
 				ssi0: ssi-0 {
 					interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x01>, <&audma1 0x02>, <&audma0 0x15>, <&audma1 0x16>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x01>, <&audma1 0x02>;
+					dma-names = "rx", "tx";
 				};
 				ssi1: ssi-1 {
 					 interrupts = <GIC_SPI 371 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x03>, <&audma1 0x04>, <&audma0 0x49>, <&audma1 0x4a>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x03>, <&audma1 0x04>;
+					dma-names = "rx", "tx";
 				};
 				ssi2: ssi-2 {
 					interrupts = <GIC_SPI 372 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x05>, <&audma1 0x06>, <&audma0 0x63>, <&audma1 0x64>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x05>, <&audma1 0x06>;
+					dma-names = "rx", "tx";
 				};
 				ssi3: ssi-3 {
 					interrupts = <GIC_SPI 373 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x07>, <&audma1 0x08>, <&audma0 0x6f>, <&audma1 0x70>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x07>, <&audma1 0x08>;
+					dma-names = "rx", "tx";
 				};
 				ssi4: ssi-4 {
 					interrupts = <GIC_SPI 374 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x09>, <&audma1 0x0a>, <&audma0 0x71>, <&audma1 0x72>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x09>, <&audma1 0x0a>;
+					dma-names = "rx", "tx";
 				};
 				ssi5: ssi-5 {
 					interrupts = <GIC_SPI 375 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0b>, <&audma1 0x0c>, <&audma0 0x73>, <&audma1 0x74>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0b>, <&audma1 0x0c>;
+					dma-names = "rx", "tx";
 				};
 				ssi6: ssi-6 {
 					interrupts = <GIC_SPI 376 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0d>, <&audma1 0x0e>, <&audma0 0x75>, <&audma1 0x76>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0d>, <&audma1 0x0e>;
+					dma-names = "rx", "tx";
 				};
 				ssi7: ssi-7 {
 					interrupts = <GIC_SPI 377 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x0f>, <&audma1 0x10>, <&audma0 0x79>, <&audma1 0x7a>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x0f>, <&audma1 0x10>;
+					dma-names = "rx", "tx";
 				};
 				ssi8: ssi-8 {
 					interrupts = <GIC_SPI 378 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x11>, <&audma1 0x12>, <&audma0 0x7b>, <&audma1 0x7c>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x11>, <&audma1 0x12>;
+					dma-names = "rx", "tx";
 				};
 				ssi9: ssi-9 {
 					interrupts = <GIC_SPI 379 IRQ_TYPE_LEVEL_HIGH>;
-					dmas = <&audma0 0x13>, <&audma1 0x14>, <&audma0 0x7d>, <&audma1 0x7e>;
-					dma-names = "rx", "tx", "rxu", "txu";
+					dmas = <&audma0 0x13>, <&audma1 0x14>;
+					dma-names = "rx", "tx";
 				};
 			};
 		};
-- 
2.11.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-01-24 15:13 UTC|newest]

Thread overview: 92+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-24 15:12 [GIT PULL] Renesas ARM64 Based SoC DT Updates for v5.1 Simon Horman
2019-01-24 15:12 ` Simon Horman
2019-01-24 15:11 ` [PATCH 01/44] arm64: dts: renesas: r8a77990: ebisu: Add backlight Simon Horman
2019-01-24 15:11   ` Simon Horman
2019-01-24 15:11 ` [PATCH 02/44] arm64: dts: renesas: r8a77995: draak: Set better backlight levels Simon Horman
2019-01-24 15:11   ` Simon Horman
2019-01-24 15:11 ` [PATCH 03/44] arm64: dts: renesas: r8a77990: ebisu: Fix EthernetAVB phy mode to rgmii Simon Horman
2019-01-24 15:11   ` Simon Horman
2019-01-24 15:11 ` [PATCH 04/44] arm64: dts: renesas: Initial device tree for r8a774c0 Simon Horman
2019-01-24 15:11   ` Simon Horman
2019-01-24 15:11 ` [PATCH 05/44] arm64: dts: renesas: r8a774c0: Add SYS-DMAC controller nodes Simon Horman
2019-01-24 15:11   ` Simon Horman
2019-01-24 15:12 ` [PATCH 06/44] arm64: dts: renesas: r8a774c0: Add SCIF and HSCIF nodes Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 07/44] arm64: dts: renesas: r8a774c0: Add INTC-EX device node Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 08/44] arm64: dts: renesas: r8a774c0: Add PFC support Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 09/44] arm64: dts: renesas: r8a774c0: Add GPIO device nodes Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 10/44] arm64: dts: renesas: r8a774c0: Add Ethernet AVB node Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 11/44] arm64: dts: renesas: r8a774c0: Add watchdog support Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 12/44] arm64: dts: renesas: r8a774c0: Add secondary CA53 CPU core Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 13/44] arm64: dts: renesas: r8a774c0: Add SDHI nodes Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 14/44] arm64: dts: renesas: r8a774c0: Add I2C and IIC-DVFS support Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 15/44] arm64: dts: renesas: r8a774c0: Add IPMMU device nodes Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 16/44] arm64: dts: renesas: r8a774c0: Add CAN nodes Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 17/44] arm64: dts: renesas: r8a774c0: Add thermal support Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 18/44] arm64: dts: renesas: r8a774c0: Add MSIOF nodes Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 19/44] arm64: dts: renesas: r8a774c0: Add audio support Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 20/44] arm64: dts: renesas: r8a774c0: Add PWM support Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 21/44] arm64: dts: renesas: r8a774c0: Add display output support Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 22/44] arm64: dts: renesas: r8a774c0: Add USB2.0 phy and host device nodes Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 23/44] arm64: dts: renesas: r8a774c0: Add USB-DMAC and HSUSB " Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 24/44] arm64: dts: renesas: r8a774c0: Add USB3.0 " Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 25/44] arm64: dts: renesas: r8a774c0: Connect RZ/G2E SYS-DMAC to IPMMU Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 26/44] arm64: dts: renesas: r8a774c0: Connect RZ/G2E AVB " Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 27/44] arm64: dts: renesas: r8a774c0: Connect RZ/G2E Audio-DMAC " Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 28/44] arm64: dts: renesas: r8a774c0: Add PCIe device node Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 29/44] arm64: dts: renesas: r8a774c0: Add VIN and CSI-2 device nodes Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 30/44] arm64: dts: renesas: r8a774a1: Fix hsusb reg size Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 31/44] arm64: dts: renesas: r8a77990: sort pciec0 node within soc node Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 32/44] arm64: dts: renesas: r8a77990: Sort i2c nodes " Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 33/44] arm64: dts: renesas: r8a7796: salvator-xs: Convert to new LVDS DT bindings Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 34/44] arm64: dts: renesas: ulcb: use audio-graph-card Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 35/44] arm64: dts: renesas: ulcb: add HDMI sound support Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 36/44] arm64: dts: renesas: ulcb-kf: add pcm3168 sound codec Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` Simon Horman [this message]
2019-01-24 15:12   ` [PATCH 37/44] arm64: dts: renesas: r8a7795: remove BUSIF0 settings from rcar_sound, ssi Simon Horman
2019-01-24 15:12 ` [PATCH 38/44] arm64: dts: renesas: r8a7796: remove BUSIF0 settings from rcar_sound,ssi Simon Horman
2019-01-24 15:12   ` [PATCH 38/44] arm64: dts: renesas: r8a7796: remove BUSIF0 settings from rcar_sound, ssi Simon Horman
2019-01-24 15:12 ` [PATCH 39/44] arm64: dts: renesas: r8a77990-ebisu: use simple-audio-card Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 40/44] arm64: dts: renesas: v3msk: specify EtherAVB PHY IRQ Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 41/44] arm64: dts: renesas: r8a77990: ebisu: Fix backlight regulator numbering Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 42/44] arm64: dts: renesas: r8a774c0: Enable DMA for SCIF2 Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 43/44] arm64: dts: renesas: r8a77990: " Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-24 15:12 ` [PATCH 44/44] arm64: dts: renesas: r8a77990: ebisu: Enable HS400 of SDHI3 Simon Horman
2019-01-24 15:12   ` Simon Horman
2019-01-30 16:55 ` [GIT PULL] Renesas ARM64 Based SoC DT Updates for v5.1 Arnd Bergmann
2019-01-30 16:55   ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=0ec8e0a879b8d7eacbfbed9a7face8f97f9493a8.1548233325.git.horms+renesas@verge.net.au \
    --to=horms+renesas@verge.net.au \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.