diff options
author | Jie Yang <yang.jie@intel.com> | 2015-10-22 13:55:07 +0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-10-22 14:01:51 +0100 |
commit | ef3e199a49c8e605e326ae60c5e156bfb1ca7e3d (patch) | |
tree | c75d7f69dbc0d6aa9e0166f40f9c4bc898b78b1e /sound/soc/intel/common/sst-dsp.h | |
parent | 624729fd51871bfbddb647764f180126789a29ee (diff) | |
download | linux-stable-ef3e199a49c8e605e326ae60c5e156bfb1ca7e3d.tar.gz linux-stable-ef3e199a49c8e605e326ae60c5e156bfb1ca7e3d.tar.bz2 linux-stable-ef3e199a49c8e605e326ae60c5e156bfb1ca7e3d.zip |
ASoC: Intel: sst: only use sst-firmware when DW DMAC is available
Currentlly, we use Synopsys DesignWare DMA Controller for
baytrail/haswell/broadwell ADSP firmware loading, but for
skylake, we don't use it, compiling sst-firmware.c may
introduce error when CONFIG_DW_DMAC_CORE is not enabled:
sound/built-in.o: In function `sst_dma_new':
(.text+0xd7b38): undefined reference to `dw_dma_probe'
sound/built-in.o: In function `sst_dma_free':
(.text+0xd7c0a): undefined reference to `dw_dma_remove'
Here we only compile sst-firmware when CONFIG_DW_DMAC_CORE
is selected, to fix the linking error issue.
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/common/sst-dsp.h')
-rw-r--r-- | sound/soc/intel/common/sst-dsp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/intel/common/sst-dsp.h b/sound/soc/intel/common/sst-dsp.h index 1f45f18715c0..859f0de00339 100644 --- a/sound/soc/intel/common/sst-dsp.h +++ b/sound/soc/intel/common/sst-dsp.h @@ -216,10 +216,12 @@ struct sst_pdata { void *dsp; }; +#if IS_ENABLED(CONFIG_DW_DMAC_CORE) /* Initialization */ struct sst_dsp *sst_dsp_new(struct device *dev, struct sst_dsp_device *sst_dev, struct sst_pdata *pdata); void sst_dsp_free(struct sst_dsp *sst); +#endif /* SHIM Read / Write */ void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value); |