* [PATCH] arm64: renesas: r8a7795: add SSIU support for sound
@ 2018-11-08 2:12 Kuninori Morimoto
2018-11-08 2:13 ` Kuninori Morimoto
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2018-11-08 2:12 UTC (permalink / raw)
To: Simon; +Cc: Magnus, linux-renesas-soc
Hi Simon
rsnd sound driver will handle SSIU from v4.21 via DT.
Of course it is keeping compatibility, thus, no SSIU settings
is no problem.
SSIU handles BUSIFn, but rsnd driver had been assumed only BUSIF0 was used.
Thus, SSIU / BUSIF0 was attached via SSI automatically,
but it was not enough for TDM Split mode.
To enable TDM Split mode, we need to select BUSIFn via SSIU.
This patch adds SSIU DT settings to r8a7795.
If we had SSIU DT settings, existing BUSIF0 settings via SSI
is no longer needed. We want to remove it.
To avoid git merge timing issue / git bisect issue,
I will re-post "remove" patch later (= for v4.22).
Please consider 1st patch and ignore 2nd patch so far.
Kuninori Morimoto (2):
arm64: renesas: r8a7795: add SSIU support for sound
arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 251 ++++++++++++++++++++++++++++---
1 file changed, 231 insertions(+), 20 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] arm64: renesas: r8a7795: add SSIU support for sound
2018-11-08 2:12 [PATCH] arm64: renesas: r8a7795: add SSIU support for sound Kuninori Morimoto
@ 2018-11-08 2:13 ` Kuninori Morimoto
2018-11-08 2:14 ` [-----] arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi Kuninori Morimoto
2018-11-08 10:53 ` [PATCH] arm64: renesas: r8a7795: add SSIU support for sound Simon Horman
2 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2018-11-08 2:13 UTC (permalink / raw)
To: Simon; +Cc: Magnus, Linux-Renesas, Jiada Wang
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
rsnd driver supports SSIU now, let's use it.
Then, BUSIF DMA settings on rcar_sound,ssi (= rxu, txu) are
no longer needed.
To avoid git merge timing issue / git bisect issue,
this patch doesn't remove it so far, but will be removed in
the future.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 211 +++++++++++++++++++++++++++++++
1 file changed, 211 insertions(+)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index 0b54c53..497c416 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -1920,6 +1920,217 @@
};
};
+ rcar_sound,ssiu {
+ ssiu00: ssiu-0 {
+ dmas = <&audma0 0x15>, <&audma1 0x16>;
+ dma-names = "rx", "tx";
+ };
+ ssiu01: ssiu-1 {
+ dmas = <&audma0 0x35>, <&audma1 0x36>;
+ dma-names = "rx", "tx";
+ };
+ ssiu02: ssiu-2 {
+ dmas = <&audma0 0x37>, <&audma1 0x38>;
+ dma-names = "rx", "tx";
+ };
+ ssiu03: ssiu-3 {
+ dmas = <&audma0 0x47>, <&audma1 0x48>;
+ dma-names = "rx", "tx";
+ };
+ ssiu04: ssiu-4 {
+ dmas = <&audma0 0x3F>, <&audma1 0x40>;
+ dma-names = "rx", "tx";
+ };
+ ssiu05: ssiu-5 {
+ dmas = <&audma0 0x43>, <&audma1 0x44>;
+ dma-names = "rx", "tx";
+ };
+ ssiu06: ssiu-6 {
+ dmas = <&audma0 0x4F>, <&audma1 0x50>;
+ dma-names = "rx", "tx";
+ };
+ ssiu07: ssiu-7 {
+ dmas = <&audma0 0x53>, <&audma1 0x54>;
+ dma-names = "rx", "tx";
+ };
+ ssiu10: ssiu-8 {
+ dmas = <&audma0 0x49>, <&audma1 0x4a>;
+ dma-names = "rx", "tx";
+ };
+ ssiu11: ssiu-9 {
+ dmas = <&audma0 0x4B>, <&audma1 0x4C>;
+ dma-names = "rx", "tx";
+ };
+ ssiu12: ssiu-10 {
+ dmas = <&audma0 0x57>, <&audma1 0x58>;
+ dma-names = "rx", "tx";
+ };
+ ssiu13: ssiu-11 {
+ dmas = <&audma0 0x59>, <&audma1 0x5A>;
+ dma-names = "rx", "tx";
+ };
+ ssiu14: ssiu-12 {
+ dmas = <&audma0 0x5F>, <&audma1 0x60>;
+ dma-names = "rx", "tx";
+ };
+ ssiu15: ssiu-13 {
+ dmas = <&audma0 0xC3>, <&audma1 0xC4>;
+ dma-names = "rx", "tx";
+ };
+ ssiu16: ssiu-14 {
+ dmas = <&audma0 0xC7>, <&audma1 0xC8>;
+ dma-names = "rx", "tx";
+ };
+ ssiu17: ssiu-15 {
+ dmas = <&audma0 0xCB>, <&audma1 0xCC>;
+ dma-names = "rx", "tx";
+ };
+ ssiu20: ssiu-16 {
+ dmas = <&audma0 0x63>, <&audma1 0x64>;
+ dma-names = "rx", "tx";
+ };
+ ssiu21: ssiu-17 {
+ dmas = <&audma0 0x67>, <&audma1 0x68>;
+ dma-names = "rx", "tx";
+ };
+ ssiu22: ssiu-18 {
+ dmas = <&audma0 0x6B>, <&audma1 0x6C>;
+ dma-names = "rx", "tx";
+ };
+ ssiu23: ssiu-19 {
+ dmas = <&audma0 0x6D>, <&audma1 0x6E>;
+ dma-names = "rx", "tx";
+ };
+ ssiu24: ssiu-20 {
+ dmas = <&audma0 0xCF>, <&audma1 0xCE>;
+ dma-names = "rx", "tx";
+ };
+ ssiu25: ssiu-21 {
+ dmas = <&audma0 0xEB>, <&audma1 0xEC>;
+ dma-names = "rx", "tx";
+ };
+ ssiu26: ssiu-22 {
+ dmas = <&audma0 0xED>, <&audma1 0xEE>;
+ dma-names = "rx", "tx";
+ };
+ ssiu27: ssiu-23 {
+ dmas = <&audma0 0xEF>, <&audma1 0xF0>;
+ dma-names = "rx", "tx";
+ };
+ ssiu30: ssiu-24 {
+ dmas = <&audma0 0x6f>, <&audma1 0x70>;
+ dma-names = "rx", "tx";
+ };
+ ssiu31: ssiu-25 {
+ dmas = <&audma0 0x21>, <&audma1 0x22>;
+ dma-names = "rx", "tx";
+ };
+ ssiu32: ssiu-26 {
+ dmas = <&audma0 0x23>, <&audma1 0x24>;
+ dma-names = "rx", "tx";
+ };
+ ssiu33: ssiu-27 {
+ dmas = <&audma0 0x25>, <&audma1 0x26>;
+ dma-names = "rx", "tx";
+ };
+ ssiu34: ssiu-28 {
+ dmas = <&audma0 0x27>, <&audma1 0x28>;
+ dma-names = "rx", "tx";
+ };
+ ssiu35: ssiu-29 {
+ dmas = <&audma0 0x29>, <&audma1 0x2A>;
+ dma-names = "rx", "tx";
+ };
+ ssiu36: ssiu-30 {
+ dmas = <&audma0 0x2B>, <&audma1 0x2C>;
+ dma-names = "rx", "tx";
+ };
+ ssiu37: ssiu-31 {
+ dmas = <&audma0 0x2D>, <&audma1 0x2E>;
+ dma-names = "rx", "tx";
+ };
+ ssiu40: ssiu-32 {
+ dmas = <&audma0 0x71>, <&audma1 0x72>;
+ dma-names = "rx", "tx";
+ };
+ ssiu41: ssiu-33 {
+ dmas = <&audma0 0x17>, <&audma1 0x18>;
+ dma-names = "rx", "tx";
+ };
+ ssiu42: ssiu-34 {
+ dmas = <&audma0 0x19>, <&audma1 0x1A>;
+ dma-names = "rx", "tx";
+ };
+ ssiu43: ssiu-35 {
+ dmas = <&audma0 0x1B>, <&audma1 0x1C>;
+ dma-names = "rx", "tx";
+ };
+ ssiu44: ssiu-36 {
+ dmas = <&audma0 0x1D>, <&audma1 0x1E>;
+ dma-names = "rx", "tx";
+ };
+ ssiu45: ssiu-37 {
+ dmas = <&audma0 0x1F>, <&audma1 0x20>;
+ dma-names = "rx", "tx";
+ };
+ ssiu46: ssiu-38 {
+ dmas = <&audma0 0x31>, <&audma1 0x32>;
+ dma-names = "rx", "tx";
+ };
+ ssiu47: ssiu-39 {
+ dmas = <&audma0 0x33>, <&audma1 0x34>;
+ dma-names = "rx", "tx";
+ };
+ ssiu50: ssiu-40 {
+ dmas = <&audma0 0x73>, <&audma1 0x74>;
+ dma-names = "rx", "tx";
+ };
+ ssiu60: ssiu-41 {
+ dmas = <&audma0 0x75>, <&audma1 0x76>;
+ dma-names = "rx", "tx";
+ };
+ ssiu70: ssiu-42 {
+ dmas = <&audma0 0x79>, <&audma1 0x7a>;
+ dma-names = "rx", "tx";
+ };
+ ssiu80: ssiu-43 {
+ dmas = <&audma0 0x7b>, <&audma1 0x7c>;
+ dma-names = "rx", "tx";
+ };
+ ssiu90: ssiu-44 {
+ dmas = <&audma0 0x7d>, <&audma1 0x7e>;
+ dma-names = "rx", "tx";
+ };
+ ssiu91: ssiu-45 {
+ dmas = <&audma0 0x7F>, <&audma1 0x80>;
+ dma-names = "rx", "tx";
+ };
+ ssiu92: ssiu-46 {
+ dmas = <&audma0 0x81>, <&audma1 0x82>;
+ dma-names = "rx", "tx";
+ };
+ ssiu93: ssiu-47 {
+ dmas = <&audma0 0x83>, <&audma1 0x84>;
+ dma-names = "rx", "tx";
+ };
+ ssiu94: ssiu-48 {
+ dmas = <&audma0 0xA3>, <&audma1 0xA4>;
+ dma-names = "rx", "tx";
+ };
+ ssiu95: ssiu-49 {
+ dmas = <&audma0 0xA5>, <&audma1 0xA6>;
+ dma-names = "rx", "tx";
+ };
+ ssiu96: ssiu-50 {
+ dmas = <&audma0 0xA7>, <&audma1 0xA8>;
+ dma-names = "rx", "tx";
+ };
+ ssiu97: ssiu-51 {
+ dmas = <&audma0 0xA9>, <&audma1 0xAA>;
+ dma-names = "rx", "tx";
+ };
+ };
+
rcar_sound,ssi {
ssi0: ssi-0 {
interrupts = <GIC_SPI 370 IRQ_TYPE_LEVEL_HIGH>;
--
2.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [-----] arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi
2018-11-08 2:12 [PATCH] arm64: renesas: r8a7795: add SSIU support for sound Kuninori Morimoto
2018-11-08 2:13 ` Kuninori Morimoto
@ 2018-11-08 2:14 ` Kuninori Morimoto
2018-11-08 10:53 ` [PATCH] arm64: renesas: r8a7795: add SSIU support for sound Simon Horman
2 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2018-11-08 2:14 UTC (permalink / raw)
To: Simon; +Cc: Magnus, Linux-Renesas, Jiada Wang
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>
---
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 497c416..56951fa 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -2134,53 +2134,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.7.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] arm64: renesas: r8a7795: add SSIU support for sound
2018-11-08 2:12 [PATCH] arm64: renesas: r8a7795: add SSIU support for sound Kuninori Morimoto
2018-11-08 2:13 ` Kuninori Morimoto
2018-11-08 2:14 ` [-----] arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi Kuninori Morimoto
@ 2018-11-08 10:53 ` Simon Horman
2018-11-09 0:03 ` Kuninori Morimoto
2 siblings, 1 reply; 5+ messages in thread
From: Simon Horman @ 2018-11-08 10:53 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Magnus, linux-renesas-soc
On Thu, Nov 08, 2018 at 02:12:14AM +0000, Kuninori Morimoto wrote:
>
> Hi Simon
>
> rsnd sound driver will handle SSIU from v4.21 via DT.
> Of course it is keeping compatibility, thus, no SSIU settings
> is no problem.
>
> SSIU handles BUSIFn, but rsnd driver had been assumed only BUSIF0 was used.
> Thus, SSIU / BUSIF0 was attached via SSI automatically,
> but it was not enough for TDM Split mode.
>
> To enable TDM Split mode, we need to select BUSIFn via SSIU.
> This patch adds SSIU DT settings to r8a7795.
>
> If we had SSIU DT settings, existing BUSIF0 settings via SSI
> is no longer needed. We want to remove it.
> To avoid git merge timing issue / git bisect issue,
> I will re-post "remove" patch later (= for v4.22).
> Please consider 1st patch and ignore 2nd patch so far.
Thanks. I have applied the 1st patch for v4.21. And marked the 2nd patch as
deferred. Please repost or ping me once v4.22-rc1 has been released.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] arm64: renesas: r8a7795: add SSIU support for sound
2018-11-08 10:53 ` [PATCH] arm64: renesas: r8a7795: add SSIU support for sound Simon Horman
@ 2018-11-09 0:03 ` Kuninori Morimoto
0 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2018-11-09 0:03 UTC (permalink / raw)
To: Simon Horman; +Cc: Magnus, linux-renesas-soc
Hi Simon
> > rsnd sound driver will handle SSIU from v4.21 via DT.
> > Of course it is keeping compatibility, thus, no SSIU settings
> > is no problem.
> >
> > SSIU handles BUSIFn, but rsnd driver had been assumed only BUSIF0 was used.
> > Thus, SSIU / BUSIF0 was attached via SSI automatically,
> > but it was not enough for TDM Split mode.
> >
> > To enable TDM Split mode, we need to select BUSIFn via SSIU.
> > This patch adds SSIU DT settings to r8a7795.
> >
> > If we had SSIU DT settings, existing BUSIF0 settings via SSI
> > is no longer needed. We want to remove it.
> > To avoid git merge timing issue / git bisect issue,
> > I will re-post "remove" patch later (= for v4.22).
> > Please consider 1st patch and ignore 2nd patch so far.
>
> Thanks. I have applied the 1st patch for v4.21. And marked the 2nd patch as
> deferred. Please repost or ping me once v4.22-rc1 has been released.
Thanks. Yes, will do.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-11-09 9:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-08 2:12 [PATCH] arm64: renesas: r8a7795: add SSIU support for sound Kuninori Morimoto
2018-11-08 2:13 ` Kuninori Morimoto
2018-11-08 2:14 ` [-----] arm64: renesas: r8a7795: remove BUSIF0 settings from rcar_sound,ssi Kuninori Morimoto
2018-11-08 10:53 ` [PATCH] arm64: renesas: r8a7795: add SSIU support for sound Simon Horman
2018-11-09 0:03 ` Kuninori Morimoto
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.