diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2023-09-21 02:53:12 +0300 |
|---|---|---|
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | 2023-09-25 10:25:04 +0300 |
| commit | d70be079c3cf34bd91e1c8f7b4bc760356c9150c (patch) | |
| tree | 35cb2ca1475c64441b7d5e2e38de61bda34f981c /arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi | |
| parent | 98537eb77d3ef185a4b1b4004da75301038cf76b (diff) | |
| download | linux-d70be079c3cf34bd91e1c8f7b4bc760356c9150c.tar.xz | |
arm64: dts: renesas: ulcb/kf: Use multi Component sound
+-- ULCB -------------------+
|+--------+ +--------+|
|| SSI0| <---> |ak4613 ||
|| SSI1| <---> | ||
|| | +--------+|
|| | +--------+|
|| SSI2| <---> |HDMI ||
|| | +--------+|
|| SSI3| <--+ |
|| SSI4| <-+| |
|+--------+ || |
+-------------||------------+
+-- Kingfisher -------------+
| || +--------+|
| |+->|pcm3168a||
| +-->| ||
| +--------+|
+---------------------------+
On UCLB/KF, we intuitively think we want to handle these as "2 Sound
Cards":
card0,0: 1st sound of ULCB (SSI0 - ak4613)
card0,1: 2nd sound of ULCB (SSI2 - HDMI)
card1,0: 1st sound of KF (SSI3 - pcm3168a)
^ ^
However, because of ASoC Component vs. Card framework limitations, we
needed to handle this as "1 big Sound Card":
card0,0: 1st sound of ULCB/KF (SSI0 - ak4613)
card0,1: 2nd sound of ULCB/KF (SSI2 - HDMI)
card0,2: 3rd sound of ULCB/KF (SSI3 - pcm3168a)
^ ^
Now ASoC supports multi Component, which allows us to handle "2 Sound
Cards" such as "ULCB Sound Card" and "Kingfisher Sound Card", all
ULCB/KF Audio dtsi can be updated.
Note that this changes the Sound Card specification method from
userland, especially for Kingfisher Sound.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/87fs382yhk.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Diffstat (limited to 'arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi index c30e056538e4..4fc229418dd7 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi @@ -13,18 +13,18 @@ * * (A) aplay -D plughw:0,0 xxx.wav * (B) aplay -D plughw:0,1 xxx.wav - * (C) aplay -D plughw:0,2 xxx.wav + * (C) aplay -D plughw:1,0 xxx.wav * * (A) arecord -D plughw:0,0 xxx.wav - * (D) arecord -D plughw:0,3 xxx.wav + * (D) arecord -D plughw:1,1 xxx.wav */ #include "ulcb-kf-audio-graph-card.dtsi" -&sound_card { +&sound_card_kf { + compatible = "audio-graph-card2"; + /delete-property/ dais; - links = <&rsnd_port0 /* (A) CPU0 <-> ak4613 */ - &rsnd_port1 /* (B) CPU1 -> HDMI */ - &rsnd_port2 /* (C) CPU2 -> PCM3168A-p */ - &rsnd_port3 /* (D) CPU3 <- PCM3168A-c */ + links = <&snd_kf1 /* (C) CPU2 -> PCM3168A-p */ + &snd_kf2 /* (D) CPU3 <- PCM3168A-c */ >; }; |