ASoC: SOF: topology: Parse DAI type token for dspless mode
Starting with LunarLake, the dspless mode can handle SoundWire/ALH, DMIC and SSPs, so we need to identify the dai type from topology. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Link: https://msgid.link/r/20240213101247.28887-12-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
67bde2e8c0
commit
f9618ff105
@ -549,6 +549,7 @@ static int sof_ipc4_widget_setup_comp_dai(struct snd_sof_widget *swidget)
|
||||
dev_dbg(scomp->dev, "dai %s node_type %u dai_type %u dai_index %d\n", swidget->widget->name,
|
||||
node_type, ipc4_copier->dai_type, ipc4_copier->dai_index);
|
||||
|
||||
dai->type = ipc4_copier->dai_type;
|
||||
ipc4_copier->data.gtw_cfg.node_id = SOF_IPC4_NODE_TYPE(node_type);
|
||||
|
||||
pipe_widget = swidget->spipe->pipe_widget;
|
||||
|
@ -514,6 +514,7 @@ struct snd_sof_route {
|
||||
struct snd_sof_dai {
|
||||
struct snd_soc_component *scomp;
|
||||
const char *name;
|
||||
u32 type;
|
||||
|
||||
int number_configs;
|
||||
int current_config;
|
||||
|
@ -2354,7 +2354,10 @@ static int sof_dspless_widget_ready(struct snd_soc_component *scomp, int index,
|
||||
struct snd_soc_tplg_dapm_widget *tw)
|
||||
{
|
||||
if (WIDGET_IS_DAI(w->id)) {
|
||||
static const struct sof_topology_token dai_tokens[] = {
|
||||
{SOF_TKN_DAI_TYPE, SND_SOC_TPLG_TUPLE_TYPE_STRING, get_token_dai_type, 0}};
|
||||
struct snd_sof_dev *sdev = snd_soc_component_get_drvdata(scomp);
|
||||
struct snd_soc_tplg_private *priv = &tw->priv;
|
||||
struct snd_sof_widget *swidget;
|
||||
struct snd_sof_dai *sdai;
|
||||
int ret;
|
||||
@ -2369,6 +2372,15 @@ static int sof_dspless_widget_ready(struct snd_soc_component *scomp, int index,
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
ret = sof_parse_tokens(scomp, &sdai->type, dai_tokens, ARRAY_SIZE(dai_tokens),
|
||||
priv->array, le32_to_cpu(priv->size));
|
||||
if (ret < 0) {
|
||||
dev_err(scomp->dev, "Failed to parse DAI tokens for %s\n", tw->name);
|
||||
kfree(swidget);
|
||||
kfree(sdai);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = sof_connect_dai_widget(scomp, w, tw, sdai);
|
||||
if (ret) {
|
||||
kfree(swidget);
|
||||
|
Loading…
x
Reference in New Issue
Block a user