topology: ABI - Separate PCM & BE/CC link support and bump ABI version to 4

The struct snd_soc_tplg_pcm_dai is renamed to snd_soc_tplg_pcm.
This struct will now be used to handle data related to PCMs
(FE DAI & DAI links). It's not for BE, because BE DAI mappings will be
provided by ACPI/FDT data.

Remove the unused struct snd_soc_tplg_pcm_cfg_caps. We are using
snd_soc_tplg_stream and snd_soc_stream_caps instead.

Define the topology type for BE DAI link: SND_SOC_TPLG_TYPE_BACKEND_LINK.

Define struct snd_soc_tplg_link_config to configure BE & CC links.

Bump ABI version to 4.

Signed-off-by: Vedang Patel <vedang.patel@intel.com>
Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Vedang Patel 2015-11-05 20:48:30 +08:00 committed by Jaroslav Kysela
parent b73d50fc2b
commit 368e4f2a89
5 changed files with 134 additions and 287 deletions

View file

@ -116,14 +116,6 @@ static int tplg_parse_config(snd_tplg_t *tplg, snd_config_t *cfg)
continue;
}
if (strcmp(id, "SectionPCMConfig") == 0) {
err = tplg_parse_compound(tplg, n,
tplg_parse_pcm_config, NULL);
if (err < 0)
return err;
continue;
}
if (strcmp(id, "SectionPCMCapabilities") == 0) {
err = tplg_parse_compound(tplg, n,
tplg_parse_pcm_caps, NULL);
@ -241,15 +233,15 @@ static int tplg_build_integ(snd_tplg_t *tplg)
if (err < 0)
return err;
err = tplg_build_pcm_dai(tplg, SND_TPLG_TYPE_PCM);
err = tplg_build_pcm(tplg, SND_TPLG_TYPE_PCM);
if (err < 0)
return err;
err = tplg_build_pcm_dai(tplg, SND_TPLG_TYPE_BE);
err = tplg_build_link_cfg(tplg, SND_TPLG_TYPE_BE);
if (err < 0)
return err;
err = tplg_build_pcm_dai(tplg, SND_TPLG_TYPE_CC);
err = tplg_build_link_cfg(tplg, SND_TPLG_TYPE_CC);
if (err < 0)
return err;