diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-05-30 14:13:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-05-30 19:24:41 +0200 |
| commit | 3467a64dded3bcdbff8c3c9db2b1f1af20a9e295 (patch) | |
| tree | c6c5f1b8c9c14efb0fcc075b32100fae0550f8ef /sound/soc/intel/skylake | |
| parent | ASoC: Intel: Skylake: Find uuids for Skylake (diff) | |
| download | linux-3467a64dded3bcdbff8c3c9db2b1f1af20a9e295.tar.xz linux-3467a64dded3bcdbff8c3c9db2b1f1af20a9e295.zip | |
ASoC: Intel: Skylake: Find uuids for Broxton
Broxton uses different offset in manifest for parsing module
table. So invoke common parsing utility from broxton using
broxton offset.
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/bxt-sst.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/intel/skylake/bxt-sst.c b/sound/soc/intel/skylake/bxt-sst.c index 0dd921349663..46235b93e4f8 100644 --- a/sound/soc/intel/skylake/bxt-sst.c +++ b/sound/soc/intel/skylake/bxt-sst.c @@ -130,6 +130,8 @@ static int sst_transfer_fw_host_dma(struct sst_dsp *ctx) return ret; } +#define BXT_ADSP_FW_BIN_HDR_OFFSET 0x2000 + static int bxt_load_base_firmware(struct sst_dsp *ctx) { struct firmware stripped_fw; @@ -146,6 +148,9 @@ static int bxt_load_base_firmware(struct sst_dsp *ctx) if (ctx->fw == NULL) goto sst_load_base_firmware_failed; + ret = snd_skl_parse_uuids(ctx, BXT_ADSP_FW_BIN_HDR_OFFSET); + if (ret < 0) + goto sst_load_base_firmware_failed; stripped_fw.data = ctx->fw->data; stripped_fw.size = ctx->fw->size; @@ -283,6 +288,7 @@ int bxt_sst_dsp_init(struct device *dev, void __iomem *mmio_base, int irq, skl->dev = dev; skl_dev.thread_context = skl; + INIT_LIST_HEAD(&skl->uuid_list); skl->dsp = skl_dsp_ctx_init(dev, &skl_dev, irq); if (!skl->dsp) { @@ -323,6 +329,7 @@ EXPORT_SYMBOL_GPL(bxt_sst_dsp_init); void bxt_sst_dsp_cleanup(struct device *dev, struct skl_sst *ctx) { + skl_freeup_uuid_list(ctx); skl_ipc_free(&ctx->ipc); ctx->dsp->cl_dev.ops.cl_cleanup_controller(ctx->dsp); |