summaryrefslogtreecommitdiffstats
path: root/sound/soc/intel/skylake/skl.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2016-02-19 11:42:34 +0530
committerMark Brown <broonie@kernel.org>2016-02-20 00:34:47 +0900
commit4b235c43deb8283802281a299cb730001a6ad1da (patch)
tree28a9fffcacb98b980988ff49f829ccd3450102d8 /sound/soc/intel/skylake/skl.c
parent2d1419a329e7de825c03738ad2ac532153239388 (diff)
downloadtalos-obmc-linux-4b235c43deb8283802281a299cb730001a6ad1da.tar.gz
talos-obmc-linux-4b235c43deb8283802281a299cb730001a6ad1da.zip
ASoC: Intel: Skylake: Generate topology name for NHLT table header
NHLT table [1] header has fields like oem_id, oem_table_id and oem_revision. Use that to load a unique topology binary specific to that platform NHLT Table is documented at: [1]: https://01.org/blogs/2016/intel-smart-sound-technology-audio-dsp Signed-off-by: Yang A Fang <yang.a.fang@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/skylake/skl.c')
-rw-r--r--sound/soc/intel/skylake/skl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c
index 06f4b2c13423..f89abb179efe 100644
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@ -573,11 +573,15 @@ static int skl_probe(struct pci_dev *pci,
if (err < 0)
goto out_free;
+ skl->pci_id = pci->device;
+
skl->nhlt = skl_nhlt_init(bus->dev);
if (skl->nhlt == NULL)
goto out_free;
+ skl_nhlt_update_topology_bin(skl);
+
pci_set_drvdata(skl->pci, ebus);
/* check if dsp is there */
OpenPOWER on IntegriCloud