summaryrefslogtreecommitdiff
path: root/sound/soc/generic
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2023-06-09 01:40:41 +0000
committerMark Brown <broonie@kernel.org>2023-06-09 10:44:41 +0100
commitca27441efe696a8990858156c6c332e786c30b4a (patch)
treefd928ea620602c656992b11a4b74622da2d61ee4 /sound/soc/generic
parent70dad53ddff0778c4920a1ee9eb1cfea539d4e91 (diff)
ASoC: audio-graph-card2-custom-sample: add missing CPU:Codec = 1:N sample
It has CPU:Codec = 1:1 and N:N samples, but missing 1:N settings. This patch adds it. One note here is that because of registering timing, probing and CPU/Codec numbering are mismatching. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://lore.kernel.org/r/87ilbx1kh3.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/generic')
-rw-r--r--sound/soc/generic/audio-graph-card2-custom-sample.dtsi26
1 files changed, 26 insertions, 0 deletions
diff --git a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi
index 994db61a26b3..f5e7d669da45 100644
--- a/sound/soc/generic/audio-graph-card2-custom-sample.dtsi
+++ b/sound/soc/generic/audio-graph-card2-custom-sample.dtsi
@@ -42,6 +42,15 @@
* [Normal]
* cpu0 <-@-----------------> codec0
*
+ * [Semi-Multi]
+ *
+ * CPU:Codec = 1:N
+ *
+ * +-+
+ * cpu7 <-@------->| |-> codec12
+ * | |-> codec13
+ * +-+
+ *
* [Multi-CPU/Codec]
* +-+ +-+
* cpu1 <--| |<-@--------->| |-> codec1
@@ -128,6 +137,9 @@
*/
&cpu0
+ /* [Semi-Multi] */
+ &sm0
+
/*
* [Multi-CPU/Codec]: cpu side only
* cpu1/cpu2/codec1/codec2
@@ -194,6 +206,13 @@
port@1 { mc2c10_ep: endpoint { remote-endpoint = <&codec10_ep>; }; };
port@2 { mc2c11_ep: endpoint { remote-endpoint = <&codec11_ep>; }; };
};
+
+ /* [Semi-Multi] */
+ ports@5 {
+ port@0 { smcodec0_ep: endpoint { remote-endpoint = <&cpu7_ep>; }; };
+ port@1 { smcodec1_ep: endpoint { remote-endpoint = <&codec12_ep>; }; };
+ port@2 { smcodec2_ep: endpoint { remote-endpoint = <&codec13_ep>; }; };
+ };
};
dpcm {
@@ -261,6 +280,9 @@
/* [DPCM-Multi]::FE */
port@5 { cpu5_ep: endpoint { remote-endpoint = <&fe10_ep>; }; };
port@6 { cpu6_ep: endpoint { remote-endpoint = <&fe11_ep>; }; };
+
+ /* [Semi-Multi] */
+ sm0: port@7 { cpu7_ep: endpoint { remote-endpoint = <&smcodec0_ep>; }; };
};
};
@@ -311,6 +333,10 @@
port@9 { codec9_ep: endpoint { remote-endpoint = <&mc2c01_ep>; }; };
port@10 { codec10_ep: endpoint { remote-endpoint = <&mc2c10_ep>; }; };
port@11 { codec11_ep: endpoint { remote-endpoint = <&mc2c11_ep>; }; };
+
+ /* [Semi-Multi] */
+ port@12 { codec12_ep: endpoint { remote-endpoint = <&smcodec1_ep>; }; };
+ port@13 { codec13_ep: endpoint { remote-endpoint = <&smcodec2_ep>; }; };
};
};
};