summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/skylake/skl.h
diff options
context:
space:
mode:
authorGuneshwor Singh <guneshwor.o.singh@intel.com>2017-10-09 11:20:30 +0530
committerMark Brown <broonie@kernel.org>2017-10-13 20:25:03 +0100
commitc3ae22e39db79bee1909d398c0debe2f7cb87d3a (patch)
tree2e3931583557f6de41272f120f1e8fe622ec3d93 /sound/soc/intel/skylake/skl.h
parent5514830dffb2332c034c20db3b264ba1f94de1d8 (diff)
downloadlinux-stable-c3ae22e39db79bee1909d398c0debe2f7cb87d3a.tar.gz
linux-stable-c3ae22e39db79bee1909d398c0debe2f7cb87d3a.tar.bz2
linux-stable-c3ae22e39db79bee1909d398c0debe2f7cb87d3a.zip
ASoC: Intel: Skylake: Add flag to check to register FE dais from topology
Since FE dais can come from topology, split the FE dais from existing dai array so that FE dais need not be registered if they come from topology. Add use_tplg_pcm flag to check whether FE dais will be registered from topology during dai driver component registration. Signed-off-by: Guneshwor Singh <guneshwor.o.singh@intel.com> Acked-By: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake/skl.h')
-rw-r--r--sound/soc/intel/skylake/skl.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 8d9d6899f761..e00cde8200dd 100644
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -53,6 +53,7 @@ struct skl {
struct platform_device *dmic_dev;
struct platform_device *i2s_dev;
struct snd_soc_platform *platform;
+ struct snd_soc_dai_driver *dais;
struct nhlt_acpi_table *nhlt; /* nhlt ptr */
struct skl_sst *skl_sst; /* sst skl ctx */
@@ -73,6 +74,7 @@ struct skl {
struct skl_debug *debugfs;
u8 nr_modules;
struct skl_module **modules;
+ bool use_tplg_pcm;
};
#define skl_to_ebus(s) (&(s)->ebus)
@@ -85,9 +87,9 @@ struct skl_dma_params {
u8 stream_tag;
};
-/* to pass dmic data */
struct skl_machine_pdata {
u32 dmic_num;
+ bool use_tplg_pcm; /* use dais and dai links from topology */
};
struct skl_dsp_ops {