Skip to content

ASoC: SOF: topology: use the default hw_config in DAI link init #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
plbossart merged 1 commit into from
Mar 30, 2019
Merged

ASoC: SOF: topology: use the default hw_config in DAI link init #758

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 24 additions & 6 deletions sound/soc/sof/topology.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2514,7 +2514,9 @@ static int sof_link_load(struct snd_soc_component *scomp, int index,
struct snd_soc_tplg_private *private = &cfg->priv;
struct sof_ipc_dai_config config;
struct snd_soc_tplg_hw_config *hw_config;
int num_hw_configs;
int ret = 0;
int i = 0;

link->platform_name = dev_name(sdev->dev);

Expand Down Expand Up @@ -2552,15 +2554,31 @@ static int sof_link_load(struct snd_soc_component *scomp, int index,
* DAI links are expected to have at least 1 hw_config.
* But some older topologies might have no hw_config for HDA dai links.
*/
if (!le32_to_cpu(cfg->num_hw_configs) &&
config.type != SOF_DAI_INTEL_HDA) {
dev_err(sdev->dev, "error: unexpected DAI config count %d!\n",
le32_to_cpu(cfg->num_hw_configs));
return -EINVAL;
num_hw_configs = le32_to_cpu(cfg->num_hw_configs);
if (!num_hw_configs) {
if (config.type != SOF_DAI_INTEL_HDA) {
dev_err(sdev->dev, "error: unexpected DAI config count %d!\n",
le32_to_cpu(cfg->num_hw_configs));
return -EINVAL;
}
} else {
dev_dbg(sdev->dev, "tplg: %d hw_configs found, default id: %d!\n",
cfg->num_hw_configs, le32_to_cpu(cfg->default_hw_config_id));

for (i = 0; i < num_hw_configs; i++) {
if (cfg->hw_config[i].id == cfg->default_hw_config_id)
break;
}

if (i == num_hw_configs) {
dev_err(sdev->dev, "error: default hw_config id: %d not found!\n",
le32_to_cpu(cfg->default_hw_config_id));
return -EINVAL;
}
}

/* configure dai IPC message */
hw_config = &cfg->hw_config[0];
hw_config = &cfg->hw_config[i];

config.hdr.cmd = SOF_IPC_GLB_DAI_MSG | SOF_IPC_DAI_CONFIG;
config.format = le32_to_cpu(hw_config->fmt);
Expand Down