Skip to content

Commit 9225752

Browse files
committed
ASoC: SOF: topology: Parse the dapm_widget_tokens in case of DSPless mode
Parsing the dapm_widget_tokens is also needed for DSPless mode as it is setting the snd_soc_dapm_widget.no_wname_in_kcontrol_name flag for the kcontrol creation from DAPM widgets. Without that flag set, the following warnings might appear because of long control names: ALSA: Control name 'eqiir.2.1 Post Mixer Analog Playback IIR Eq bytes' truncated to 'eqiir.2.1 Post Mixer Analog Playback IIR Eq' ALSA: Control name 'eqfir.2.1 Post Mixer Analog Playback FIR Eq bytes' truncated to 'eqfir.2.1 Post Mixer Analog Playback FIR Eq' ALSA: Control name 'drc.2.1 Post Mixer Analog Playback DRC bytes' truncated to 'drc.2.1 Post Mixer Analog Playback DRC byte' ALSA: Control name 'drc.2.1 Post Mixer Analog Playback DRC switch' truncated to 'drc.2.1 Post Mixer Analog Playback DRC swit' ALSA: Control name 'gain.15.1 Pre Mixer Deepbuffer HDA Analog Volume' truncated to 'gain.15.1 Pre Mixer Deepbuffer HDA Analog V' Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 99ec8ef commit 9225752

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

sound/soc/sof/topology.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2368,14 +2368,25 @@ static int sof_dspless_widget_ready(struct snd_soc_component *scomp, int index,
23682368
struct snd_soc_dapm_widget *w,
23692369
struct snd_soc_tplg_dapm_widget *tw)
23702370
{
2371+
struct snd_soc_tplg_private *priv = &tw->priv;
2372+
int ret;
2373+
2374+
/* for snd_soc_dapm_widget.no_wname_in_kcontrol_name */
2375+
ret = sof_parse_tokens(scomp, w, dapm_widget_tokens,
2376+
ARRAY_SIZE(dapm_widget_tokens),
2377+
priv->array, le32_to_cpu(priv->size));
2378+
if (ret < 0) {
2379+
dev_err(scomp->dev, "failed to parse dapm widget tokens for %s\n",
2380+
w->name);
2381+
return ret;
2382+
}
2383+
23712384
if (WIDGET_IS_DAI(w->id)) {
23722385
static const struct sof_topology_token dai_tokens[] = {
23732386
{SOF_TKN_DAI_TYPE, SND_SOC_TPLG_TUPLE_TYPE_STRING, get_token_dai_type, 0}};
23742387
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
2375-
struct snd_soc_tplg_private *priv = &tw->priv;
23762388
struct snd_sof_widget *swidget;
23772389
struct snd_sof_dai *sdai;
2378-
int ret;
23792390

23802391
swidget = kzalloc(sizeof(*swidget), GFP_KERNEL);
23812392
if (!swidget)

0 commit comments

Comments
 (0)