aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/intel/skylake
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-08-10 09:40:49 +0530
committerMark Brown <broonie@kernel.org>2016-08-10 18:54:05 +0100
commit64cb1d0ad0eada322c2011e15710d2a1c12ce8b6 (patch)
tree2d6e2d7bf7c5b324f706523667e14f74dd1e8fcf /sound/soc/intel/skylake
parentASoC: Intel: Skylake: modify snd_skl_get_module_info args (diff)
downloadwireguard-linux-64cb1d0ad0eada322c2011e15710d2a1c12ce8b6.tar.xz
wireguard-linux-64cb1d0ad0eada322c2011e15710d2a1c12ce8b6.zip
ASoC: Intel: Skylake: Populate modules after loading
Once topology and firmware are loaded, we can parse the manifest. Use driver pipe and widget list to get list of all modules and populate the data. Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake')
-rw-r--r--sound/soc/intel/skylake/skl-pcm.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 140249269cdb..eb1f00b28df1 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -1138,6 +1138,32 @@ static int skl_pcm_new(struct snd_soc_pcm_runtime *rtd)
return retval;
}
+static int skl_populate_modules(struct skl *skl)
+{
+ struct skl_pipeline *p;
+ struct skl_pipe_module *m;
+ struct snd_soc_dapm_widget *w;
+ struct skl_module_cfg *mconfig;
+ int ret;
+
+ list_for_each_entry(p, &skl->ppl_list, node) {
+ list_for_each_entry(m, &p->pipe->w_list, node) {
+
+ w = m->w;
+ mconfig = w->priv;
+
+ ret = snd_skl_get_module_info(skl->skl_sst, mconfig);
+ if (ret < 0) {
+ dev_err(skl->skl_sst->dev,
+ "query module info failed:%d\n", ret);
+ goto err;
+ }
+ }
+ }
+err:
+ return ret;
+}
+
static int skl_platform_soc_probe(struct snd_soc_platform *platform)
{
struct hdac_ext_bus *ebus = dev_get_drvdata(platform->dev);
@@ -1169,6 +1195,7 @@ static int skl_platform_soc_probe(struct snd_soc_platform *platform)
dev_err(platform->dev, "Failed to boot first fw: %d\n", ret);
return ret;
}
+ skl_populate_modules(skl);
}
pm_runtime_mark_last_busy(platform->dev);
pm_runtime_put_autosuspend(platform->dev);