* [PATCH linux-next v2 1/9] arm64: r8a7795: add dma request number for busif0 ~ busif7
2018-10-03 8:58 [PATCH linux-next v2 0/9] ASoC: rsnd: support to use different BUSIF for GEN3 jiada_wang
@ 2018-10-03 8:58 ` jiada_wang
2018-10-04 0:55 ` Kuninori Morimoto
2018-10-03 8:58 ` [PATCH linux-next v2 2/9] arm64: r8a7796: " jiada_wang
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: jiada_wang @ 2018-10-03 8:58 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, kuninori.morimoto.gx
Cc: alsa-devel, linux-kernel
From: Jiada Wang <jiada_wang@mentor.com>
This patch adds dma request number for busif0 ~ busif7
to be used by GEN3 series. GEN2 continues to use rxu/txu
for busif data transfer.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 164 ++++++++++++++++++++---
1 file changed, 144 insertions(+), 20 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index b5f2273caca4..fc6100eddfed 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -1923,53 +1923,177 @@
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>,
+ <&audma0 0x15>, <&audma1 0x16>,
+ <&audma0 0x15>, <&audma1 0x16>,
+ <&audma0 0x35>, <&audma1 0x36>,
+ <&audma0 0x37>, <&audma1 0x38>,
+ <&audma0 0x47>, <&audma1 0x48>,
+ <&audma0 0x3f>, <&audma1 0x40>,
+ <&audma0 0x43>, <&audma1 0x44>,
+ <&audma0 0x4f>, <&audma1 0x50>,
+ <&audma0 0x53>, <&audma1 0x54>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x49>, <&audma1 0x4a>,
+ <&audma0 0x49>, <&audma1 0x4a>,
+ <&audma0 0x4b>, <&audma1 0x4c>,
+ <&audma0 0x57>, <&audma1 0x58>,
+ <&audma0 0x59>, <&audma1 0x5a>,
+ <&audma0 0x5f>, <&audma1 0x60>,
+ <&audma0 0xc3>, <&audma1 0xc4>,
+ <&audma0 0xc7>, <&audma1 0xc8>,
+ <&audma0 0xcb>, <&audma1 0xcc>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x63>, <&audma1 0x64>,
+ <&audma0 0x63>, <&audma1 0x64>,
+ <&audma0 0x67>, <&audma1 0x68>,
+ <&audma0 0x6b>, <&audma1 0x6c>,
+ <&audma0 0x6d>, <&audma1 0x6e>,
+ <&audma0 0xcf>, <&audma1 0xce>,
+ <&audma0 0xeb>, <&audma1 0xec>,
+ <&audma0 0xed>, <&audma1 0xee>,
+ <&audma0 0xef>, <&audma1 0xf0>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x6f>, <&audma1 0x70>,
+ <&audma0 0x6f>, <&audma1 0x70>,
+ <&audma0 0x21>, <&audma1 0x22>,
+ <&audma0 0x23>, <&audma1 0x24>,
+ <&audma0 0x25>, <&audma1 0x26>,
+ <&audma0 0x27>, <&audma1 0x28>,
+ <&audma0 0x29>, <&audma1 0x2a>,
+ <&audma0 0x2b>, <&audma1 0x2c>,
+ <&audma0 0x2d>, <&audma1 0x2e>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x71>, <&audma1 0x72>,
+ <&audma0 0x71>, <&audma1 0x72>,
+ <&audma0 0x17>, <&audma1 0x18>,
+ <&audma0 0x19>, <&audma1 0x1a>,
+ <&audma0 0x1b>, <&audma1 0x1c>,
+ <&audma0 0x1d>, <&audma1 0x1e>,
+ <&audma0 0x1f>, <&audma1 0x20>,
+ <&audma0 0x31>, <&audma1 0x32>,
+ <&audma0 0x33>, <&audma1 0x34>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x73>, <&audma1 0x74>,
+ <&audma0 0x73>, <&audma1 0x74>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x75>, <&audma1 0x76>,
+ <&audma0 0x75>, <&audma1 0x76>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x79>, <&audma1 0x7a>,
+ <&audma0 0x79>, <&audma1 0x7a>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x7b>, <&audma1 0x7c>,
+ <&audma0 0x7b>, <&audma1 0x7c>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x7d>, <&audma1 0x7e>,
+ <&audma0 0x7d>, <&audma1 0x7e>,
+ <&audma0 0x7f>, <&audma1 0x80>,
+ <&audma0 0x81>, <&audma1 0x82>,
+ <&audma0 0x83>, <&audma1 0x84>,
+ <&audma0 0xa3>, <&audma1 0xa4>,
+ <&audma0 0xa5>, <&audma1 0xa6>,
+ <&audma0 0xa7>, <&audma1 0xa8>,
+ <&audma0 0xa9>, <&audma1 0xaa>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
};
--
2.17.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH linux-next v2 1/9] arm64: r8a7795: add dma request number for busif0 ~ busif7
2018-10-03 8:58 ` [PATCH linux-next v2 1/9] arm64: r8a7795: add dma request number for busif0 ~ busif7 jiada_wang
@ 2018-10-04 0:55 ` Kuninori Morimoto
2018-10-04 3:15 ` Jiada Wang
0 siblings, 1 reply; 7+ messages in thread
From: Kuninori Morimoto @ 2018-10-04 0:55 UTC (permalink / raw)
To: jiada_wang; +Cc: lgirdwood, broonie, perex, tiwai, alsa-devel, linux-kernel
Hi Jiada
Thank you for your patch
> From: Jiada Wang <jiada_wang@mentor.com>
>
> This patch adds dma request number for busif0 ~ busif7
> to be used by GEN3 series. GEN2 continues to use rxu/txu
> for busif data transfer.
>
> Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
> ---
> arch/arm64/boot/dts/renesas/r8a7795.dtsi | 164 ++++++++++++++++++++---
> 1 file changed, 144 insertions(+), 20 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> index b5f2273caca4..fc6100eddfed 100644
> --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
> @@ -1923,53 +1923,177 @@
> 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>,
> + <&audma0 0x15>, <&audma1 0x16>,
> + <&audma0 0x15>, <&audma1 0x16>,
> + <&audma0 0x35>, <&audma1 0x36>,
> + <&audma0 0x37>, <&audma1 0x38>,
> + <&audma0 0x47>, <&audma1 0x48>,
> + <&audma0 0x3f>, <&audma1 0x40>,
> + <&audma0 0x43>, <&audma1 0x44>,
> + <&audma0 0x4f>, <&audma1 0x50>,
> + <&audma0 0x53>, <&audma1 0x54>;
> + dma-names = "rx", "tx",
> + "rxu", "txu",
> + "rxu0", "txu0",
> + "rxu1", "txu1",
> + "rxu2", "txu2",
> + "rxu3", "txu3",
> + "rxu4", "txu4",
> + "rxu5", "txu5",
> + "rxu6", "txu6",
> + "rxu7", "txu7";
In theory, I think DT side patch should be posted/applied
if driver side patch was accepted.
And, Gen3 side DT doesn't need "rxu/txu" I think.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH linux-next v2 1/9] arm64: r8a7795: add dma request number for busif0 ~ busif7
2018-10-04 0:55 ` Kuninori Morimoto
@ 2018-10-04 3:15 ` Jiada Wang
0 siblings, 0 replies; 7+ messages in thread
From: Jiada Wang @ 2018-10-04 3:15 UTC (permalink / raw)
To: Kuninori Morimoto
Cc: lgirdwood, broonie, perex, tiwai, alsa-devel, linux-kernel
Hi Morimoto-san
On 2018/10/04 9:55, Kuninori Morimoto wrote:
> Hi Jiada
>
> Thank you for your patch
>
>> From: Jiada Wang <jiada_wang@mentor.com>
>>
>> This patch adds dma request number for busif0 ~ busif7
>> to be used by GEN3 series. GEN2 continues to use rxu/txu
>> for busif data transfer.
>>
>> Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
>> ---
>> arch/arm64/boot/dts/renesas/r8a7795.dtsi | 164 ++++++++++++++++++++---
>> 1 file changed, 144 insertions(+), 20 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
>> index b5f2273caca4..fc6100eddfed 100644
>> --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
>> +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
>> @@ -1923,53 +1923,177 @@
>> 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>,
>> + <&audma0 0x15>, <&audma1 0x16>,
>> + <&audma0 0x15>, <&audma1 0x16>,
>> + <&audma0 0x35>, <&audma1 0x36>,
>> + <&audma0 0x37>, <&audma1 0x38>,
>> + <&audma0 0x47>, <&audma1 0x48>,
>> + <&audma0 0x3f>, <&audma1 0x40>,
>> + <&audma0 0x43>, <&audma1 0x44>,
>> + <&audma0 0x4f>, <&audma1 0x50>,
>> + <&audma0 0x53>, <&audma1 0x54>;
>> + dma-names = "rx", "tx",
>> + "rxu", "txu",
>> + "rxu0", "txu0",
>> + "rxu1", "txu1",
>> + "rxu2", "txu2",
>> + "rxu3", "txu3",
>> + "rxu4", "txu4",
>> + "rxu5", "txu5",
>> + "rxu6", "txu6",
>> + "rxu7", "txu7";
> In theory, I think DT side patch should be posted/applied
> if driver side patch was accepted.
> And, Gen3 side DT doesn't need "rxu/txu" I think.
OK, I will separate DT and driver side change,
will remove DT change in next version.
Thanks,
Jiada
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH linux-next v2 2/9] arm64: r8a7796: add dma request number for busif0 ~ busif7
2018-10-03 8:58 [PATCH linux-next v2 0/9] ASoC: rsnd: support to use different BUSIF for GEN3 jiada_wang
2018-10-03 8:58 ` [PATCH linux-next v2 1/9] arm64: r8a7795: add dma request number for busif0 ~ busif7 jiada_wang
@ 2018-10-03 8:58 ` jiada_wang
2018-10-03 8:58 ` [PATCH linux-next v2 3/9] arm64: r8a774a1: " jiada_wang
2018-10-03 8:58 ` [PATCH linux-next v2 4/9] arm64: r8a7795: change to use extended audio dmac register jiada_wang
3 siblings, 0 replies; 7+ messages in thread
From: jiada_wang @ 2018-10-03 8:58 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, kuninori.morimoto.gx
Cc: alsa-devel, linux-kernel
From: Jiada Wang <jiada_wang@mentor.com>
This patch adds dma request number for busif0 ~ busif7
to be used by GEN3 series. GEN2 continues to use rxu/txu
for busif data transfer.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
arch/arm64/boot/dts/renesas/r8a7796.dtsi | 164 ++++++++++++++++++++---
1 file changed, 144 insertions(+), 20 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
index 1ec6aaa520c1..53b361c5b16d 100644
--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
@@ -1797,53 +1797,177 @@
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>,
+ <&audma0 0x15>, <&audma1 0x16>,
+ <&audma0 0x15>, <&audma1 0x16>,
+ <&audma0 0x35>, <&audma1 0x36>,
+ <&audma0 0x37>, <&audma1 0x38>,
+ <&audma0 0x47>, <&audma1 0x48>,
+ <&audma0 0x3f>, <&audma1 0x40>,
+ <&audma0 0x43>, <&audma1 0x44>,
+ <&audma0 0x4f>, <&audma1 0x50>,
+ <&audma0 0x53>, <&audma1 0x54>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x49>, <&audma1 0x4a>,
+ <&audma0 0x49>, <&audma1 0x4a>,
+ <&audma0 0x4b>, <&audma1 0x4c>,
+ <&audma0 0x57>, <&audma1 0x58>,
+ <&audma0 0x59>, <&audma1 0x5a>,
+ <&audma0 0x5f>, <&audma1 0x60>,
+ <&audma0 0xc3>, <&audma1 0xc4>,
+ <&audma0 0xc7>, <&audma1 0xc8>,
+ <&audma0 0xcb>, <&audma1 0xcc>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x63>, <&audma1 0x64>,
+ <&audma0 0x63>, <&audma1 0x64>,
+ <&audma0 0x67>, <&audma1 0x68>,
+ <&audma0 0x6b>, <&audma1 0x6c>,
+ <&audma0 0x6d>, <&audma1 0x6e>,
+ <&audma0 0xcf>, <&audma1 0xce>,
+ <&audma0 0xeb>, <&audma1 0xec>,
+ <&audma0 0xed>, <&audma1 0xee>,
+ <&audma0 0xef>, <&audma1 0xf0>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x6f>, <&audma1 0x70>,
+ <&audma0 0x6f>, <&audma1 0x70>,
+ <&audma0 0x21>, <&audma1 0x22>,
+ <&audma0 0x23>, <&audma1 0x24>,
+ <&audma0 0x25>, <&audma1 0x26>,
+ <&audma0 0x27>, <&audma1 0x28>,
+ <&audma0 0x29>, <&audma1 0x2a>,
+ <&audma0 0x2b>, <&audma1 0x2c>,
+ <&audma0 0x2d>, <&audma1 0x2e>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x71>, <&audma1 0x72>,
+ <&audma0 0x71>, <&audma1 0x72>,
+ <&audma0 0x17>, <&audma1 0x18>,
+ <&audma0 0x19>, <&audma1 0x1a>,
+ <&audma0 0x1b>, <&audma1 0x1c>,
+ <&audma0 0x1d>, <&audma1 0x1e>,
+ <&audma0 0x1f>, <&audma1 0x20>,
+ <&audma0 0x31>, <&audma1 0x32>,
+ <&audma0 0x33>, <&audma1 0x34>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x73>, <&audma1 0x74>,
+ <&audma0 0x73>, <&audma1 0x74>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x75>, <&audma1 0x76>,
+ <&audma0 0x75>, <&audma1 0x76>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x79>, <&audma1 0x7a>,
+ <&audma0 0x79>, <&audma1 0x7a>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x7b>, <&audma1 0x7c>,
+ <&audma0 0x7b>, <&audma1 0x7c>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x7d>, <&audma1 0x7e>,
+ <&audma0 0x7d>, <&audma1 0x7e>,
+ <&audma0 0x7f>, <&audma1 0x80>,
+ <&audma0 0x81>, <&audma1 0x82>,
+ <&audma0 0x83>, <&audma1 0x84>,
+ <&audma0 0xa3>, <&audma1 0xa4>,
+ <&audma0 0xa5>, <&audma1 0xa6>,
+ <&audma0 0xa7>, <&audma1 0xa8>,
+ <&audma0 0xa9>, <&audma1 0xaa>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
};
--
2.17.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH linux-next v2 3/9] arm64: r8a774a1: add dma request number for busif0 ~ busif7
2018-10-03 8:58 [PATCH linux-next v2 0/9] ASoC: rsnd: support to use different BUSIF for GEN3 jiada_wang
2018-10-03 8:58 ` [PATCH linux-next v2 1/9] arm64: r8a7795: add dma request number for busif0 ~ busif7 jiada_wang
2018-10-03 8:58 ` [PATCH linux-next v2 2/9] arm64: r8a7796: " jiada_wang
@ 2018-10-03 8:58 ` jiada_wang
2018-10-03 8:58 ` [PATCH linux-next v2 4/9] arm64: r8a7795: change to use extended audio dmac register jiada_wang
3 siblings, 0 replies; 7+ messages in thread
From: jiada_wang @ 2018-10-03 8:58 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, kuninori.morimoto.gx
Cc: alsa-devel, linux-kernel
From: Jiada Wang <jiada_wang@mentor.com>
This patch adds dma request number for busif0 ~ busif7
to be used by GEN3 series. GEN2 continues to use rxu/txu
for busif data transfer.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 164 +++++++++++++++++++---
1 file changed, 144 insertions(+), 20 deletions(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
index 012cbb64246e..ad2c9c0148ae 100644
--- a/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a774a1.dtsi
@@ -1247,53 +1247,177 @@
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>,
+ <&audma0 0x15>, <&audma1 0x16>,
+ <&audma0 0x15>, <&audma1 0x16>,
+ <&audma0 0x35>, <&audma1 0x36>,
+ <&audma0 0x37>, <&audma1 0x38>,
+ <&audma0 0x47>, <&audma1 0x48>,
+ <&audma0 0x3f>, <&audma1 0x40>,
+ <&audma0 0x43>, <&audma1 0x44>,
+ <&audma0 0x4f>, <&audma1 0x50>,
+ <&audma0 0x53>, <&audma1 0x54>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x49>, <&audma1 0x4a>,
+ <&audma0 0x49>, <&audma1 0x4a>,
+ <&audma0 0x4b>, <&audma1 0x4c>,
+ <&audma0 0x57>, <&audma1 0x58>,
+ <&audma0 0x59>, <&audma1 0x5a>,
+ <&audma0 0x5f>, <&audma1 0x60>,
+ <&audma0 0xc3>, <&audma1 0xc4>,
+ <&audma0 0xc7>, <&audma1 0xc8>,
+ <&audma0 0xcb>, <&audma1 0xcc>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x63>, <&audma1 0x64>,
+ <&audma0 0x63>, <&audma1 0x64>,
+ <&audma0 0x67>, <&audma1 0x68>,
+ <&audma0 0x6b>, <&audma1 0x6c>,
+ <&audma0 0x6d>, <&audma1 0x6e>,
+ <&audma0 0xcf>, <&audma1 0xce>,
+ <&audma0 0xeb>, <&audma1 0xec>,
+ <&audma0 0xed>, <&audma1 0xee>,
+ <&audma0 0xef>, <&audma1 0xf0>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x6f>, <&audma1 0x70>,
+ <&audma0 0x6f>, <&audma1 0x70>,
+ <&audma0 0x21>, <&audma1 0x22>,
+ <&audma0 0x23>, <&audma1 0x24>,
+ <&audma0 0x25>, <&audma1 0x26>,
+ <&audma0 0x27>, <&audma1 0x28>,
+ <&audma0 0x29>, <&audma1 0x2a>,
+ <&audma0 0x2b>, <&audma1 0x2c>,
+ <&audma0 0x2d>, <&audma1 0x2e>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x71>, <&audma1 0x72>,
+ <&audma0 0x71>, <&audma1 0x72>,
+ <&audma0 0x17>, <&audma1 0x18>,
+ <&audma0 0x19>, <&audma1 0x1a>,
+ <&audma0 0x1b>, <&audma1 0x1c>,
+ <&audma0 0x1d>, <&audma1 0x1e>,
+ <&audma0 0x1f>, <&audma1 0x20>,
+ <&audma0 0x31>, <&audma1 0x32>,
+ <&audma0 0x33>, <&audma1 0x34>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
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>,
+ <&audma0 0x73>, <&audma1 0x74>,
+ <&audma0 0x73>, <&audma1 0x74>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x75>, <&audma1 0x76>,
+ <&audma0 0x75>, <&audma1 0x76>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x79>, <&audma1 0x7a>,
+ <&audma0 0x79>, <&audma1 0x7a>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x7b>, <&audma1 0x7c>,
+ <&audma0 0x7b>, <&audma1 0x7c>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0";
};
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>,
+ <&audma0 0x7d>, <&audma1 0x7e>,
+ <&audma0 0x7d>, <&audma1 0x7e>,
+ <&audma0 0x7f>, <&audma1 0x80>,
+ <&audma0 0x81>, <&audma1 0x82>,
+ <&audma0 0x83>, <&audma1 0x84>,
+ <&audma0 0xa3>, <&audma1 0xa4>,
+ <&audma0 0xa5>, <&audma1 0xa6>,
+ <&audma0 0xa7>, <&audma1 0xa8>,
+ <&audma0 0xa9>, <&audma1 0xaa>;
+ dma-names = "rx", "tx",
+ "rxu", "txu",
+ "rxu0", "txu0",
+ "rxu1", "txu1",
+ "rxu2", "txu2",
+ "rxu3", "txu3",
+ "rxu4", "txu4",
+ "rxu5", "txu5",
+ "rxu6", "txu6",
+ "rxu7", "txu7";
};
};
--
2.17.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH linux-next v2 4/9] arm64: r8a7795: change to use extended audio dmac register
2018-10-03 8:58 [PATCH linux-next v2 0/9] ASoC: rsnd: support to use different BUSIF for GEN3 jiada_wang
` (2 preceding siblings ...)
2018-10-03 8:58 ` [PATCH linux-next v2 3/9] arm64: r8a774a1: " jiada_wang
@ 2018-10-03 8:58 ` jiada_wang
3 siblings, 0 replies; 7+ messages in thread
From: jiada_wang @ 2018-10-03 8:58 UTC (permalink / raw)
To: lgirdwood, broonie, perex, tiwai, kuninori.morimoto.gx
Cc: alsa-devel, linux-kernel
From: Jiada Wang <jiada_wang@mentor.com>
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.
Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
---
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index fc6100eddfed..257c33887e19 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -1796,7 +1796,7 @@
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
<0 0xec541000 0 0x280>, /* SSI */
- <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/
+ <0 0xec760000 0 0x200>; /* Audio DMAC peri peri*/
reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
clocks = <&cpg CPG_MOD 1005>,
--
2.17.0
^ permalink raw reply related [flat|nested] 7+ messages in thread