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-audio-graph-card2-mix+split.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-audio-graph-card2-mix+split.dtsi')
-rw-r--r-- | arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi index 75b024e3fef1..8966e6a7d28b 100644 --- a/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi +++ b/arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi @@ -20,13 +20,12 @@ / { sound_card: sound { compatible = "audio-graph-card2"; - label = "rcar-sound"; + label = "snd-ulcb-mix"; routing = "ak4613 Playback", "DAI0 Playback", "ak4613 Playback", "DAI1 Playback", "DAI0 Capture", "ak4613 Capture"; - /delete-property/ dais; links = <&fe_a /* (A) CPU0 */ &fe_b /* (B) CPU1 */ &be_x /* (X) ak4613 */ @@ -50,14 +49,12 @@ }; ports@1 { - #address-cells = <1>; - #size-cells = <0>; reg = <1>; /* * BE * (X) ak4613 */ - be_x: port@0 { reg = <0>; be_x_ep: endpoint { remote-endpoint = <&ak4613_x_ep>; }; }; + be_x: port { be_x_ep: endpoint { remote-endpoint = <&ak4613_x_ep>; }; }; }; }; }; @@ -78,9 +75,13 @@ }; &rcar_sound { - ports { + #address-cells = <1>; + #size-cells = <0>; + + ports@0 { #address-cells = <1>; #size-cells = <0>; + reg = <0>; /* * (A) CPU0 |