Skip to content

Commit 6af4f85

Browse files
committed
ASoC: cs48l32: Add secondary voicectrl dais for multi-buffer fw
Change-Id: I018e7836f8b72e7eef588de02ae63a232b4254dc Signed-off-by: Stuart Henderson <[email protected]>
1 parent 18150de commit 6af4f85

File tree

1 file changed

+24
-1
lines changed

1 file changed

+24
-1
lines changed

sound/soc/codecs/cs48l32.c

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1086,6 +1086,7 @@ static const struct snd_soc_dapm_route cs48l32_dapm_routes[] = {
10861086

10871087
{ "Audio Trace DSP", NULL, "DSP1" },
10881088
{ "Voice Ctrl DSP", NULL, "DSP1" },
1089+
{ "Voice Ctrl 2 DSP", NULL, "DSP1" },
10891090

10901091
{ "MICBIAS1", NULL, "VOUT_MIC" },
10911092

@@ -1374,6 +1375,27 @@ static struct snd_soc_dai_driver cs48l32_dai[] = {
13741375
.formats = TACNA_FORMATS,
13751376
},
13761377
},
1378+
{
1379+
.name = "cs48l32-cpu-voicectrl2",
1380+
.capture = {
1381+
.stream_name = "Voice Ctrl 2 CPU",
1382+
.channels_min = 1,
1383+
.channels_max = 8,
1384+
.rates = TACNA_RATES,
1385+
.formats = TACNA_FORMATS,
1386+
},
1387+
.compress_new = &snd_soc_new_compress,
1388+
},
1389+
{
1390+
.name = "cs48l32-dsp-voicectrl2",
1391+
.capture = {
1392+
.stream_name = "Voice Ctrl 2 DSP",
1393+
.channels_min = 1,
1394+
.channels_max = 8,
1395+
.rates = TACNA_RATES,
1396+
.formats = TACNA_FORMATS,
1397+
},
1398+
},
13771399
};
13781400

13791401
static int cs48l32_compr_open(struct snd_compr_stream *stream)
@@ -1383,7 +1405,8 @@ static int cs48l32_compr_open(struct snd_compr_stream *stream)
13831405
struct tacna_priv *priv = &cs48l32->core;
13841406

13851407
if (strcmp(rtd->codec_dai->name, "cs48l32-dsp-trace") &&
1386-
strcmp(rtd->codec_dai->name, "cs48l32-dsp-voicectrl")) {
1408+
strcmp(rtd->codec_dai->name, "cs48l32-dsp-voicectrl") &&
1409+
strcmp(rtd->codec_dai->name, "cs48l32-dsp-voicectrl2")) {
13871410
dev_err(priv->dev,
13881411
"No suitable compressed stream for DAI '%s'\n",
13891412
rtd->codec_dai->name);

0 commit comments

Comments
 (0)