diff options
| author | Vinod Koul | 2016-02-19 07:12:34 +0100 |
|---|---|---|
| committer | Mark Brown | 2016-02-19 16:34:47 +0100 |
| commit | 4b235c43deb8283802281a299cb730001a6ad1da (patch) | |
| tree | 28a9fffcacb98b980988ff49f829ccd3450102d8 /sound/soc/intel/skylake/skl-topology.c | |
| parent | ASoC: Intel: Skylake: Fill BE blob with default params (diff) | |
| download | kernel-qcow2-linux-4b235c43deb8283802281a299cb730001a6ad1da.tar.gz kernel-qcow2-linux-4b235c43deb8283802281a299cb730001a6ad1da.tar.xz kernel-qcow2-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-topology.c')
| -rw-r--r-- | sound/soc/intel/skylake/skl-topology.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sound/soc/intel/skylake/skl-topology.c b/sound/soc/intel/skylake/skl-topology.c index 216d7a8e5680..ba0d02d1613e 100644 --- a/sound/soc/intel/skylake/skl-topology.c +++ b/sound/soc/intel/skylake/skl-topology.c @@ -1716,11 +1716,16 @@ int skl_tplg_init(struct snd_soc_platform *platform, struct hdac_ext_bus *ebus) struct hdac_bus *bus = ebus_to_hbus(ebus); struct skl *skl = ebus_to_skl(ebus); - ret = request_firmware(&fw, "dfw_sst.bin", bus->dev); + ret = request_firmware(&fw, skl->tplg_name, bus->dev); if (ret < 0) { dev_err(bus->dev, "tplg fw %s load failed with %d\n", - "dfw_sst.bin", ret); - return ret; + skl->tplg_name, ret); + ret = request_firmware(&fw, "dfw_sst.bin", bus->dev); + if (ret < 0) { + dev_err(bus->dev, "Fallback tplg fw %s load failed with %d\n", + "dfw_sst.bin", ret); + return ret; + } } /* |