arm64: renesas: add sound support
Subsystems (3)
v6 cover arm64: renesas: add sound support
Hi,
these are v2 patches which add sound support to the r8a7795/Salvator-X.
These patches are an update of Simon's v5 patch-set
The main change to the patches themselves since Morimoto-san's v3 posting and v4 updates to that posting is to update to new CPG/MSSR bindings via Geert Uytterhoeven.
It doesn't include cs2000 support since it is not accepted yet. I will send additional patch if it was accepted.
This patches doesn't include CTU/MIX support either, because it is too advanced feature at this point.
Base:
* "[PATCH v4 0/3] arm64: renesas: r8a7795: add I2C support" This can be found in the topic/r8a7795-i2c-v4 branch of my renesas tree on kernel.org.
Kuninori Morimoto (12):
arm64: renesas: r8a7795: add AUDIO_DMAC support
arm64: renesas: r8a7795: Sound SSI PIO support
arm64: renesas: r8a7795: Sound SSI DMA support
arm64: renesas: r8a7795: Sound SRC support
arm64: renesas: r8a7795: Sound DVC support
arm64: renesas: salvator-x: Sound SSI PIO support
arm64: renesas: salvator-x: Sound SSI DMA support
arm64: renesas: salvator-x: Sound SSI DMA support via BUSIF
arm64: renesas: salvator-x: Sound SRC support
arm64: renesas: salvator-x: Sound DVC support
arm64: defconfig: add Renesas R-Car DMAC driver support
arm64: defconfig: add Renesas sound and AK4613 support
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 94 +++++++++++++++++++++++++++++++++++++++++ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm64/configs/defconfig | 6 +++ 3 files changed, 353 insertions(+)
Signature · 1 line
2.1.4
PATCH v6 1/12 arm64: renesas: r8a7795: add AUDIO_DMAC support
From: Kuninori Morimoto <[email protected]>
---
v5 -> v6
- no change
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 64 ++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +64 -0
@@ -202,6 +202,70 @@ #power-domain-cells = <0>; }; + audma0: dma-controller at ec700000 { + compatible = "renesas,rcar-dmac"; + reg = <0 0xec700000 0 0x10000>; + interrupts = <0 350 IRQ_TYPE_LEVEL_HIGH + 0 320 IRQ_TYPE_LEVEL_HIGH + 0 321 IRQ_TYPE_LEVEL_HIGH + 0 322 IRQ_TYPE_LEVEL_HIGH + 0 323 IRQ_TYPE_LEVEL_HIGH + 0 324 IRQ_TYPE_LEVEL_HIGH + 0 325 IRQ_TYPE_LEVEL_HIGH + 0 326 IRQ_TYPE_LEVEL_HIGH + 0 327 IRQ_TYPE_LEVEL_HIGH + 0 328 IRQ_TYPE_LEVEL_HIGH + 0 329 IRQ_TYPE_LEVEL_HIGH + 0 330 IRQ_TYPE_LEVEL_HIGH + 0 331 IRQ_TYPE_LEVEL_HIGH + 0 332 IRQ_TYPE_LEVEL_HIGH + 0 333 IRQ_TYPE_LEVEL_HIGH + 0 334 IRQ_TYPE_LEVEL_HIGH + 0 335 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14", "ch15"; + clocks = <&cpg CPG_MOD 502>; + clock-names = "fck"; + power-domains = <&cpg>; + #dma-cells = <1>; + dma-channels = <16>; + }; + + audma1: dma-controller at ec720000 { + compatible = "renesas,rcar-dmac"; + reg = <0 0xec720000 0 0x10000>; + interrupts = <0 351 IRQ_TYPE_LEVEL_HIGH + 0 336 IRQ_TYPE_LEVEL_HIGH + 0 337 IRQ_TYPE_LEVEL_HIGH + 0 338 IRQ_TYPE_LEVEL_HIGH + 0 339 IRQ_TYPE_LEVEL_HIGH + 0 340 IRQ_TYPE_LEVEL_HIGH + 0 341 IRQ_TYPE_LEVEL_HIGH + 0 342 IRQ_TYPE_LEVEL_HIGH + 0 343 IRQ_TYPE_LEVEL_HIGH + 0 344 IRQ_TYPE_LEVEL_HIGH + 0 345 IRQ_TYPE_LEVEL_HIGH + 0 346 IRQ_TYPE_LEVEL_HIGH + 0 347 IRQ_TYPE_LEVEL_HIGH + 0 348 IRQ_TYPE_LEVEL_HIGH + 0 349 IRQ_TYPE_LEVEL_HIGH + 0 382 IRQ_TYPE_LEVEL_HIGH + 0 383 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "error", + "ch0", "ch1", "ch2", "ch3", + "ch4", "ch5", "ch6", "ch7", + "ch8", "ch9", "ch10", "ch11", + "ch12", "ch13", "ch14", "ch15"; + clocks = <&cpg CPG_MOD 501>; + clock-names = "fck"; + power-domains = <&cpg>; + #dma-cells = <1>; + dma-channels = <16>; + }; + pfc: pfc at e6060000 { compatible = "renesas,pfc-r8a7795"; reg = <0 0xe6060000 0 0x50c>;
Signature · 1 line
1.9.1
PATCH v6 2/12 arm64: renesas: r8a7795: Sound SSI PIO support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
This patch adds SSI for PIO sound support
---
v5 -> v6
- no change
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 95 ++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +95 -0
@@ -51,6 +51,29 @@ clock-frequency = <0>; }; + /* + * The external audio clocks are configured as 0 Hz fixed frequency + * clocks by default. + * Boards that provide audio clocks should override them. + */ + audio_clk_a: audio_clk_a { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + }; + + audio_clk_b: audio_clk_b { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + }; + + audio_clk_c: audio_clk_c { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <0>; + }; + soc { compatible = "simple-bus"; interrupt-parent = <&gic>;
@@ -473,5 +496,77 @@ power-domains = <&cpg>; status = "disabled"; }; + + rcar_sound: sound at ec500000 { + /* + * #sound-dai-cells is required + * + * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>; + * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>; + */ + /* + * #clock-cells is required for audio_clkout0/1/2/3 + * + * clkout : #clock-cells = <0>; <&rcar_sound>; + * clkout0/1/2/3: #clock-cells = <1>; <&rcar_sound N>; + */ + compatible = "renesas,rcar_sound-r8a7795", "renesas,rcar_sound-gen3"; + reg = <0 0xec500000 0 0x1000>, /* SCU */ + <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"; + + clocks = <&cpg CPG_MOD 1005>, + <&cpg CPG_MOD 1006>, <&cpg CPG_MOD 1007>, + <&cpg CPG_MOD 1008>, <&cpg CPG_MOD 1009>, + <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>, + <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>, + <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>, + <&audio_clk_a>, <&audio_clk_b>, + <&audio_clk_c>, + <&cpg CPG_CORE R8A7795_CLK_S0D4>; + clock-names = "ssi-all", + "ssi.9", "ssi.8", "ssi.7", "ssi.6", + "ssi.5", "ssi.4", "ssi.3", "ssi.2", + "ssi.1", "ssi.0", + "clk_a", "clk_b", "clk_c", "clk_i"; + power-domains = <&cpg>; + status = "disabled"; + + 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>; + }; + }; + }; }; };
Signature · 1 line
1.9.1
PATCH v6 3/12 arm64: renesas: r8a7795: Sound SSI DMA support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
---
v5 -> v6
- no change
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +20 -0
@@ -538,33 +538,53 @@ rcar_sound,ssi { 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"; }; }; };
Signature · 1 line
1.9.1
PATCH v6 4/12 arm64: renesas: r8a7795: Sound SRC support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
---
v5 -> v6
- no change
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 61 ++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +61 -0
@@ -524,6 +524,11 @@ <&cpg CPG_MOD 1010>, <&cpg CPG_MOD 1011>, <&cpg CPG_MOD 1012>, <&cpg CPG_MOD 1013>, <&cpg CPG_MOD 1014>, <&cpg CPG_MOD 1015>, + <&cpg CPG_MOD 1022>, <&cpg CPG_MOD 1023>, + <&cpg CPG_MOD 1024>, <&cpg CPG_MOD 1025>, + <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>, + <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>, + <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>, <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&cpg CPG_CORE R8A7795_CLK_S0D4>;
@@ -531,10 +536,66 @@ "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5", "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0", + "src.9", "src.8", "src.7", "src.6", + "src.5", "src.4", "src.3", "src.2", + "src.1", "src.0", "clk_a", "clk_b", "clk_c", "clk_i"; power-domains = <&cpg>; status = "disabled"; + rcar_sound,src { + 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>;
Signature · 1 line
1.9.1
PATCH v6 5/12 arm64: renesas: r8a7795: Sound DVC support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
---
v5 -> v6
- no change
arch/arm64/boot/dts/renesas/r8a7795.dtsi | 13 +++++++++++++ 1 file changed, 13 insertions(+)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +13 -0
@@ -529,6 +529,7 @@ <&cpg CPG_MOD 1026>, <&cpg CPG_MOD 1027>, <&cpg CPG_MOD 1028>, <&cpg CPG_MOD 1029>, <&cpg CPG_MOD 1030>, <&cpg CPG_MOD 1031>, + <&cpg CPG_MOD 1019>, <&cpg CPG_MOD 1018>, <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&cpg CPG_CORE R8A7795_CLK_S0D4>;
@@ -539,10 +540,22 @@ "src.9", "src.8", "src.7", "src.6", "src.5", "src.4", "src.3", "src.2", "src.1", "src.0", + "dvc.0", "dvc.1", "clk_a", "clk_b", "clk_c", "clk_i"; power-domains = <&cpg>; status = "disabled"; + rcar_sound,dvc { + 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>;
Signature · 1 line
1.9.1
PATCH v6 6/12 arm64: renesas: salvator-x: Sound SSI PIO support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
This patch adds PIO sound support for Salvator-X board. It can use 44.1kHz base sound only at this point, since 48kHz base sound needs CS2000, but it is not yet upstreamed.
---
v5 -> v6
- remove cs2000 support
- tidyup sound pin
- tidyup suond clock
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+)
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +76 -0
@@ -31,6 +31,28 @@ /* first 128MB is reserved for secure area. */ reg = <0x0 0x48000000 0x0 0x38000000>; }; + + x12_clk: x12_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <24576000>; + }; + + rsnd_ak4613: sound { + compatible = "simple-audio-card"; + + simple-audio-card,format = "left_j"; + simple-audio-card,bitclock-master = <&sndcpu>; + simple-audio-card,frame-master = <&sndcpu>; + + sndcpu: simple-audio-card,cpu { + sound-dai = <&rcar_sound>; + }; + + sndcodec: simple-audio-card,codec { + sound-dai = <&ak4613>; + }; + }; }; &extal_clk {
@@ -56,6 +78,17 @@ renesas,groups = "avb_mdc"; renesas,function = "avb"; }; + + sound_pins: sound { + renesas,groups = "ssi01239_ctrl", "ssi0_data", "ssi1_data_a"; + renesas,function = "ssi"; + }; + + sound_clk_pins: sound_clk { + renesas,groups = "audio_clk_a_a", "audio_clk_b_a", "audio_clk_c_a", + "audio_clkout_a", "audio_clkout3_a"; + renesas,function = "audio_clk"; + }; }; &scif1 {
@@ -77,6 +110,49 @@ pinctrl-names = "default"; status = "okay"; + + clock-frequency = <100000>; + + ak4613: codec at 10 { + compatible = "asahi-kasei,ak4613"; + #sound-dai-cells = <0>; + reg = <0x10>; + clocks = <&rcar_sound 3>; + }; +}; + +&rcar_sound { + pinctrl-0 = <&sound_pins &sound_clk_pins>; + pinctrl-names = "default"; + + /* Single DAI */ + #sound-dai-cells = <0>; + + /* audio_clkout0/1/2/3 */ + #clock-cells = <1>; + clock-frequency = <11289600>; + + status = "okay"; + + rcar_sound,dai { + dai0 { + playback = <&ssi0>; + capture = <&ssi1>; + }; + }; +}; + +&ssi0 { + pio-transfer; +}; + +&ssi1 { + pio-transfer; + shared-pin; +}; + +&audio_clk_a { + clock-frequency = <22579200>; }; &avb {
Signature · 1 line
1.9.1
PATCH v6 7/12 arm64: renesas: salvator-x: Sound SSI DMA support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
DMA transfer to/from SSI
DMA
[MEM] -> [SSI]
DMA
[MEM] <- [SSI]
---
v5 -> v6
- no change
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +2 -2
@@ -143,11 +143,11 @@ }; &ssi0 { - pio-transfer; + no-busif; }; &ssi1 { - pio-transfer; + no-busif; shared-pin; };
Signature · 1 line
1.9.1
PATCH v6 8/12 arm64: renesas: salvator-x: Sound SSI DMA support via BUSIF
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
DMA transfer to/from SSIU
DMA
[MEM] -> [SSIU] -> [SSI]
DMA
[MEM] <- [SSIU] <- [SSI]
---
v5 -> v6
- no change
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 5 ----- 1 file changed, 5 deletions(-)
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +0 -5
@@ -142,12 +142,7 @@ }; }; -&ssi0 { - no-busif; -}; - &ssi1 { - no-busif; shared-pin; };
Signature · 1 line
1.9.1
PATCH v6 9/12 arm64: renesas: salvator-x: Sound SRC support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
---
v5 -> v6
- no change
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +2 -2
@@ -136,8 +136,8 @@ rcar_sound,dai { dai0 { - playback = <&ssi0>; - capture = <&ssi1>; + playback = <&ssi0 &src0>; + capture = <&ssi1 &src1>; }; }; };
Signature · 1 line
1.9.1
PATCH v6 10/12 arm64: renesas: salvator-x: Sound DVC support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
---
v5 -> v6
- no change
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +25 -2
@@ -8,6 +8,29 @@ * kind, whether express or implied. */ +/* + * SSI-AK4613 + * + * This command is required when Playback/Capture + * + * amixer set "DVC Out" 100% + * amixer set "DVC In" 100% + * + * You can use Mute + * + * amixer set "DVC Out Mute" on + * amixer set "DVC In Mute" on + * + * You can use Volume Ramp + * + * amixer set "DVC Out Ramp Up Rate" "0.125 dB/64 steps" + * amixer set "DVC Out Ramp Down Rate" "0.125 dB/512 steps" + * amixer set "DVC Out Ramp" on + * aplay xxx.wav & + * amixer set "DVC Out" 80% // Volume Down + * amixer set "DVC Out" 100% // Volume Up + */ + /dts-v1/; #include "r8a7795.dtsi"
@@ -136,8 +159,8 @@ rcar_sound,dai { dai0 { - playback = <&ssi0 &src0>; - capture = <&ssi1 &src1>; + playback = <&ssi0 &src0 &dvc0>; + capture = <&ssi1 &src1 &dvc1>; }; }; };
Signature · 1 line
1.9.1
PATCH v6 11/12 arm64: defconfig: add Renesas R-Car DMAC driver support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
---
v5 -> v6
- no change
arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm64/configs/defconfig +1 -0
@@ -180,6 +180,7 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_XGENE=y CONFIG_DMADEVICES=y +CONFIG_RCAR_DMAC=y CONFIG_QCOM_BAM_DMA=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=y
Signature · 1 line
1.9.1
PATCH v6 12/12 arm64: defconfig: add Renesas sound and AK4613 support
In reply to Kuninori MorimotoFrom: Kuninori Morimoto <[email protected]>
---
v5 -> v6
- no change
arch/arm64/configs/defconfig | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/configs/defconfig +5 -0
@@ -153,6 +153,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_RCAR=y +CONFIG_SND_SOC_AK4613=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y
Signature · 1 line
1.9.1
v6 cover arm64: renesas: add sound support
In reply to Kuninori MorimotoQuoted 15 lines · Kuninori Morimoto
Hi,
these are v2 patches which add sound support to the r8a7795/Salvator-X.
These patches are an update of Simon's v5 patch-set
The main change to the patches themselves since Morimoto-san's v3 posting and v4 updates to that posting is to update to new CPG/MSSR bindings via Geert Uytterhoeven.
It doesn't include cs2000 support since it is not accepted yet. I will send additional patch if it was accepted.
This patches doesn't include CTU/MIX support either, because it is too advanced feature at this point.
Quoted 5 lines
Base:
* "[PATCH v4 0/3] arm64: renesas: r8a7795: add I2C support" This can be found in the topic/r8a7795-i2c-v4 branch of my renesas tree on kernel.org.
Thanks.
In order to aid review I have made this patchset available in the topic/r8a7795-sound-v6 branch of my renesas tree on kernel.org. The topic/r8a7795-i2c-v4 branch is there too.
Quoted 7 lines
Kuninori Morimoto (12):
arm64: renesas: r8a7795: addAUDIO_DMACsupport
arm64: renesas: r8a7795: Sound SSI PIO support
arm64: renesas: r8a7795: Sound SSI DMA support
arm64: renesas: r8a7795: Sound SRC support
arm64: renesas: r8a7795: Sound DVC support
arm64: renesas: salvator-x: Sound SSI PIO support
The above patch seemed to have some fuzz. Please check that I resolved that correctly.
Quoted 5 lines
arm64: renesas: salvator-x: Sound SSI DMA support
arm64: renesas: salvator-x: Sound SSI DMA support via BUSIF
arm64: renesas: salvator-x: Sound SRC support
arm64: renesas: salvator-x: Sound DVC support
arm64: defconfig: add Renesas R-Car DMAC driver support
The above patch did not apply cleanly. I have fixed that and also I modified the patch to enable CONFIG_DMADEVICES as well as CONFIG_RCAR_DMAC. Please check this e.g. using make savedefconfig.
Quoted 10 lines
arm64: defconfig: add Renesas sound and AK4613 support
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 94 +++++++++++++++++++++++++++++++++++++++++ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm64/configs/defconfig | 6 +++ 3 files changed, 353 insertions(+)Signature · 1 line
2.1.4
v6 cover arm64: renesas: add sound support
Quoted 22 lines · Simon Horman
Quoted 15 lines · Kuninori Morimoto
Hi,
these are v2 patches which add sound support to the r8a7795/Salvator-X.
These patches are an update of Simon's v5 patch-set
The main change to the patches themselves since Morimoto-san's v3 posting and v4 updates to that posting is to update to new CPG/MSSR bindings via Geert Uytterhoeven.
It doesn't include cs2000 support since it is not accepted yet. I will send additional patch if it was accepted.
This patches doesn't include CTU/MIX support either, because it is too advanced feature at this point.Quoted 5 lines
Base:
* "[PATCH v4 0/3] arm64: renesas: r8a7795: add I2C support" This can be found in the topic/r8a7795-i2c-v4 branch of my renesas tree on kernel.org.
Quoted 5 lines
Thanks.
In order to aid review I have made this patchset available in the topic/r8a7795-sound-v6 branch of my renesas tree on kernel.org. The topic/r8a7795-i2c-v4 branch is there too.
I have also pushed topic/r8a7795-sound-v6.runtime which is a merge of topic/r8a7795-sound-v6 with its run-time dependencies that I am aware of.
Quoted 36 lines
Quoted 7 lines
Kuninori Morimoto (12):
arm64: renesas: r8a7795: addAUDIO_DMACsupport
arm64: renesas: r8a7795: Sound SSI PIO support
arm64: renesas: r8a7795: Sound SSI DMA support
arm64: renesas: r8a7795: Sound SRC support
arm64: renesas: r8a7795: Sound DVC support
arm64: renesas: salvator-x: Sound SSI PIO supportThe above patch seemed to have some fuzz. Please check that I resolved that correctly.
Quoted 5 lines
arm64: renesas: salvator-x: Sound SSI DMA support
arm64: renesas: salvator-x: Sound SSI DMA support via BUSIF
arm64: renesas: salvator-x: Sound SRC support
arm64: renesas: salvator-x: Sound DVC support
arm64: defconfig: add Renesas R-Car DMAC driver supportThe above patch did not apply cleanly. I have fixed that and also I modified the patch to enable
CONFIG_DMADEVICESas well asCONFIG_RCAR_DMAC. Please check this e.g. using make savedefconfig.Quoted 10 lines
arm64: defconfig: add Renesas sound and AK4613 support
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 94 +++++++++++++++++++++++++++++++++++++++++ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm64/configs/defconfig | 6 +++ 3 files changed, 353 insertions(+)Signature · 1 line
2.1.4--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
v6 cover arm64: renesas: add sound support
In reply to Simon HormanHi Simon,
Quoted 4 lines · Simon Horman
Quoted 1 line
arm64: renesas: salvator-x: Sound SSI PIO support
The above patch seemed to have some fuzz. Please check that I resolved that correctly.
The ak4613 node is now a child node of scif2 instead of i2c2, which is definitely not correct.
"git diff topic/r8a7795-sound-v5..topic/r8a7795-sound-v6" will show you.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
v6 cover arm64: renesas: add sound support
Quoted 5 lines · Geert Uytterhoeven
Hi Simon,
Quoted 2 lines · Simon Horman
Quoted 1 line
arm64: renesas: salvator-x: Sound SSI PIO support
Quoted 7 lines
Quoted 2 lines
The above patch seemed to have some fuzz. Please check that I resolved that correctly.
The ak4613 node is now a child node of scif2 instead of i2c2, which is definitely not correct.
"git diff topic/r8a7795-sound-v5..topic/r8a7795-sound-v6" will show you.
Thanks, that is a bit of a disaster. Sorry about that.
I have tried to fix the problem and re-pushed topic/r8a7795-sound-v6. The head commit is now:
03a185979391 ("arm64: defconfig: add Renesas sound and AK4613 support")
v6 cover arm64: renesas: add sound support
Hi Simon,
Quoted 10 lines · Simon Horman
Quoted 9 lines · Geert Uytterhoeven
Quoted 4 lines · Simon Horman
Quoted 1 line
arm64: renesas: salvator-x: Sound SSI PIO support
The above patch seemed to have some fuzz. Please check that I resolved that correctly.
The ak4613 node is now a child node of scif2 instead of i2c2, which is definitely not correct.
Quoted 8 lines
Quoted 1 line
"git diff topic/r8a7795-sound-v5..topic/r8a7795-sound-v6" will show you.
Thanks, that is a bit of a disaster. Sorry about that.
I have tried to fix the problem and re-pushed topic/r8a7795-sound-v6. The head commit is now:
03a185979391("arm64: defconfig: add Renesas sound and AK4613 support")
Thanks, looks much better now.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
v6 cover arm64: renesas: add sound support
Quoted 15 lines · Geert Uytterhoeven
Hi Simon,
Quoted 12 lines · Simon Horman
Quoted 10 lines · Geert Uytterhoeven
Quoted 4 lines · Simon Horman
Quoted 1 line
arm64: renesas: salvator-x: Sound SSI PIO support
The above patch seemed to have some fuzz. Please check that I resolved that correctly.
The ak4613 node is now a child node of scif2 instead of i2c2, which is definitely not correct.
"git diff topic/r8a7795-sound-v5..topic/r8a7795-sound-v6" will show you.
Quoted 8 lines
Quoted 6 lines
Thanks, that is a bit of a disaster. Sorry about that.
I have tried to fix the problem and re-pushed topic/r8a7795-sound-v6. The head commit is now:
03a185979391("arm64: defconfig: add Renesas sound and AK4613 support")Thanks, looks much better now.
Thanks for checking.
v6 cover arm64: renesas: add sound support
Hi Morimoto-san,
Quoted 18 lines · Simon Horman
Quoted 17 lines · Geert Uytterhoeven
Hi Simon,
Quoted 14 lines · Simon Horman
Quoted 10 lines · Geert Uytterhoeven
Quoted 4 lines · Simon Horman
Quoted 1 line
arm64: renesas: salvator-x: Sound SSI PIO support
The above patch seemed to have some fuzz. Please check that I resolved that correctly.
The ak4613 node is now a child node of scif2 instead of i2c2, which is definitely not correct.
"git diff topic/r8a7795-sound-v5..topic/r8a7795-sound-v6" will show you.
Thanks, that is a bit of a disaster. Sorry about that.
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
I have tried to fix the problem and re-pushed topic/r8a7795-sound-v6. The head commit is now:
03a185979391("arm64: defconfig: add Renesas sound and AK4613 support")Thanks, looks much better now.
Thanks for checking.
I am wondering if it is appropriate to queue up this series for v4.5. Could you let me know what your thoughts on that are?
v6 cover arm64: renesas: add sound support
Hi Simon
Quoted 21 lines
Quoted 21 lines · Geert Uytterhoeven
Quoted 20 lines
Hi Simon,
Quoted 17 lines · Simon Horman
Quoted 10 lines · Geert Uytterhoeven
Quoted 4 lines · Simon Horman
Quoted 1 line
arm64: renesas: salvator-x: Sound SSI PIO support
The above patch seemed to have some fuzz. Please check that I resolved that correctly.
The ak4613 node is now a child node of scif2 instead of i2c2, which is definitely not correct.
"git diff topic/r8a7795-sound-v5..topic/r8a7795-sound-v6" will show you.
Thanks, that is a bit of a disaster. Sorry about that.
I have tried to fix the problem and re-pushed topic/r8a7795-sound-v6. The head commit is now:
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line
03a185979391("arm64: defconfig: add Renesas sound and AK4613 support")Thanks, looks much better now.
Thanks for checking.
I am wondering if it is appropriate to queue up this series for v4.5. Could you let me know what your thoughts on that are?
I would like to check latest version.
Which branch/tag can I check ?
v6 cover arm64: renesas: add sound support
Quoted 28 lines · Kuninori Morimoto
Hi Simon
Quoted 25 lines
Quoted 25 lines · Geert Uytterhoeven
Quoted 23 lines
Hi Simon,
Quoted 10 lines · Simon Horman
Quoted 9 lines · Geert Uytterhoeven
Quoted 4 lines · Simon Horman
Quoted 1 line
arm64: renesas: salvator-x: Sound SSI PIO support
The above patch seemed to have some fuzz. Please check that I resolved that correctly.
The ak4613 node is now a child node of scif2 instead of i2c2, which is definitely not correct.
Quoted 8 lines
Quoted 1 line
"git diff topic/r8a7795-sound-v5..topic/r8a7795-sound-v6" will show you.
Thanks, that is a bit of a disaster. Sorry about that.
I have tried to fix the problem and re-pushed topic/r8a7795-sound-v6. The head commit is now:
03a185979391("arm64: defconfig: add Renesas sound and AK4613 support")Thanks, looks much better now.
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Thanks for checking.
I am wondering if it is appropriate to queue up this series for v4.5. Could you let me know what your thoughts on that are?
I would like to check latest version.
Which branch/tag can I check ?
If you want to check for apply-time and compile-time dependencies use the latest renesas-devel tag in my renesas tree.
If you want to check run-time you may need to pull in some dependencies, especially the cpg-mssr-v6 branch of Geert's renesas-drivers tree. A sledge-hammer approach would be to pull in the latest renesas-drivers tag of that tree.
In any case I'll need to know what run-time dependencies, other than cpg-mssr, are missing from renesas-next and/or renesas-devel so we can sensibly decide what to queue up.
v6 cover arm64: renesas: add sound support
Hi Simon
Cc Geert
Quoted 6 lines
Quoted 2 lines
I would like to check latest version.
Which branch/tag can I check ?If you want to check for apply-time and compile-time dependencies use the latest renesas-devel tag in my renesas tree.
Quoted 8 lines
If you want to check run-time you may need to pull in some dependencies, especially the cpg-mssr-v6 branch of Geert's renesas-drivers tree. A sledge-hammer approach would be to pull in the latest renesas-drivers tag of that tree.
In any case I'll need to know what run-time dependencies, other than cpg-mssr, are missing from renesas-next and/or renesas-devel so we can sensibly decide what to queue up.
Recent renesas-drivers sound has many conflicts, and sound has strange behavior. I had tried it before and noticed. I'm not sure latest one, but it has conflict log. I'm using a littile older kernel, because of above reason.
Anyway, I tried below, and I could get sound. (Limited sound only, because we are lacking CS2000 driver)
> git checkout renesas-devel-20151123-v4.4-rc2
> git merge geert/topic/cpg-mssr-v6
> git am -3 ${PATCH-SET}I will send ${PATCH-SET} soon
v6 cover arm64: renesas: add sound support
Hi Morimoto-san, Simon,
Quoted 6 lines · Kuninori Morimoto
Quoted 6 lines
Quoted 2 lines
I would like to check latest version.
Which branch/tag can I check ?If you want to check for apply-time and compile-time dependencies use the latest renesas-devel tag in my renesas tree.
Quoted 8 lines
Quoted 8 lines
If you want to check run-time you may need to pull in some dependencies, especially the cpg-mssr-v6 branch of Geert's renesas-drivers tree. A sledge-hammer approach would be to pull in the latest renesas-drivers tag of that tree.
In any case I'll need to know what run-time dependencies, other than cpg-mssr, are missing from renesas-next and/or renesas-devel so we can sensibly decide what to queue up.
This is about DT, which is independent from code? ;-)
Quoted 4 lines
Recent renesas-drivers sound has many conflicts, and sound has strange behavior. I had tried it before and noticed. I'm not sure latest one, but it has conflict log. I'm using a littile older kernel, because of above reason.
You mean the conflict when merging vsp1-kms-20151112~4?
As that branch is based on a very old renesas-drivers release, I made sure that merging it doesn't impact any sound driver. I.e. I reverted all changes not related to rcar-du and vsp1.
You can verify using git diff 38f5d0b6..1f9e8ee5
Quoted 1 line
Anyway, I tried below, and I could get sound.
Good, thanks for checking!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
v6 cover arm64: renesas: add sound support
Quoted 15 lines · Geert Uytterhoeven
Hi Morimoto-san, Simon,
Quoted 11 lines · Kuninori Morimoto
Quoted 11 lines
Quoted 2 lines
I would like to check latest version.
Which branch/tag can I check ?If you want to check for apply-time and compile-time dependencies use the latest renesas-devel tag in my renesas tree.
If you want to check run-time you may need to pull in some dependencies, especially the cpg-mssr-v6 branch of Geert's renesas-drivers tree. A sledge-hammer approach would be to pull in the latest renesas-drivers tag of that tree.
Quoted 5 lines
Quoted 3 lines
Quoted 3 lines
In any case I'll need to know what run-time dependencies, other than cpg-mssr, are missing from renesas-next and/or renesas-devel so we can sensibly decide what to queue up.
This is about DT, which is independent from code? ;-)
Yes, I agree.
But I would at least like to get a handle on what the dependencies are. To make sure the bindings are on track. And to make sure there is some way to test the code.
Quoted 27 lines
Quoted 4 lines
Recent renesas-drivers sound has many conflicts, and sound has strange behavior. I had tried it before and noticed. I'm not sure latest one, but it has conflict log. I'm using a littile older kernel, because of above reason.
You mean the conflict when merging vsp1-kms-20151112~4?
As that branch is based on a very old renesas-drivers release, I made sure that merging it doesn't impact any sound driver. I.e. I reverted all changes not related to rcar-du and vsp1.You can verify using git diff
38f5d0b6..1f9e8ee5Quoted 1 line
Anyway, I tried below, and I could get sound.
Good, thanks for checking!
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.orgIn personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
v6 cover arm64: renesas: add sound support
In reply to Simon HormanHi Simon
Cc Geert
Quoted 6 lines
Quoted 2 lines
I would like to check latest version.
Which branch/tag can I check ?If you want to check for apply-time and compile-time dependencies use the latest renesas-devel tag in my renesas tree.
Quoted 8 lines
If you want to check run-time you may need to pull in some dependencies, especially the cpg-mssr-v6 branch of Geert's renesas-drivers tree. A sledge-hammer approach would be to pull in the latest renesas-drivers tag of that tree.
In any case I'll need to know what run-time dependencies, other than cpg-mssr, are missing from renesas-next and/or renesas-devel so we can sensibly decide what to queue up.
Recent renesas-drivers sound has many conflicts, and sound has strange behavior. I had tried it before and noticed. I'm not sure latest one, but it has conflict log. I'm using a littile older kernel, because of above reason.
Anyway, I tried below, and I could get sound. (Limited sound only, because we are lacking CS2000 driver)
> git checkout renesas-devel-20151123-v4.4-rc2
> git merge geert/topic/cpg-mssr-v6
> git am -3 ${PATCH-SET}I will send ${PATCH-SET} soon
v6 cover arm64: renesas: add sound support
Quoted 15 lines · Kuninori Morimoto
Hi Simon
Cc GeertQuoted 11 lines
Quoted 2 lines
I would like to check latest version.
Which branch/tag can I check ?If you want to check for apply-time and compile-time dependencies use the latest renesas-devel tag in my renesas tree.
If you want to check run-time you may need to pull in some dependencies, especially the cpg-mssr-v6 branch of Geert's renesas-drivers tree. A sledge-hammer approach would be to pull in the latest renesas-drivers tag of that tree.
Quoted 8 lines
Quoted 3 lines
In any case I'll need to know what run-time dependencies, other than cpg-mssr, are missing from renesas-next and/or renesas-devel so we can sensibly decide what to queue up.
Recent renesas-drivers sound has many conflicts, and sound has strange behavior. I had tried it before and noticed. I'm not sure latest one, but it has conflict log. I'm using a littile older kernel, because of above reason.
:(
Quoted 10 lines
Anyway, I tried below, and I could get sound. (Limited sound only, because we are lacking CS2000 driver)
> git checkout renesas-devel-20151123-v4.4-rc2 > git merge geert/topic/cpg-mssr-v6 > git am -3 ${PATCH-SET}I will send ${PATCH-SET} soon
From my POV this is a good result.