summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/skylake/skl.h
diff options
context:
space:
mode:
authorPankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>2017-12-18 06:16:50 +0100
committerMark Brown <broonie@kernel.org>2017-12-20 11:48:18 +0100
commit752c93aa72e60ba573bbcfcd508b9cc550db0b94 (patch)
tree0e14a2b4911b11616eb3114790ed45cf9b07188a /sound/soc/intel/skylake/skl.h
parentASoC: Intel: Skylake: Request IRQ late only after all context are initialized (diff)
downloadlinux-752c93aa72e60ba573bbcfcd508b9cc550db0b94.tar.xz
linux-752c93aa72e60ba573bbcfcd508b9cc550db0b94.zip
ASoC: Intel: Skylake: Ensure dai and dailink registration happens in sequence.
Platform registration happens in probe work handler whereas machine device is registered during skl_probe. This sometimes results in cpu dais not found if the work handler is sufficiently delayed due to system load, even with deferred probe of machine driver. So move machine device registration after registering platform. Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com> 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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl.h b/sound/soc/intel/skylake/skl.h
index 46dda88ba139..f411579bc713 100644
--- a/sound/soc/intel/skylake/skl.h
+++ b/sound/soc/intel/skylake/skl.h
@@ -94,6 +94,7 @@ struct skl {
struct skl_module **modules;
bool use_tplg_pcm;
struct skl_fw_config cfg;
+ struct snd_soc_acpi_mach *mach;
};
#define skl_to_ebus(s) (&(s)->ebus)