Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ASoC: Intel: Make atom components independent of sst-dsp

With sound/soc/intel/haswell and /baytrail gone, registers left within
sst-dsp header are atom-specific. Relocate these to atom internal header
to make atom truely independent of sound/soc/common processing code.

Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@intel.com>
Link: https://lore.kernel.org/r/20201006064907.16277-12-cezary.rojewski@intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Cezary Rojewski and committed by
Mark Brown
b972153d 7d07f9c1

+7 -21
-1
sound/soc/intel/atom/sst/sst.c
··· 26 26 #include <asm/platform_sst_audio.h> 27 27 #include "../sst-mfld-platform.h" 28 28 #include "sst.h" 29 - #include "../../common/sst-dsp.h" 30 29 31 30 MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>"); 32 31 MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>");
+7
sound/soc/intel/atom/sst/sst.h
··· 34 34 #define MRFLD_FW_FEATURE_BASE_OFFSET 0x4 35 35 #define MRFLD_FW_BSS_RESET_BIT 0 36 36 37 + /* SST Shim register map */ 38 + #define SST_CSR 0x00 39 + #define SST_ISRX 0x18 40 + #define SST_IMRX 0x28 41 + #define SST_IPCX 0x38 /* IPC IA -> SST */ 42 + #define SST_IPCD 0x40 /* IPC SST -> IA */ 43 + 37 44 extern const struct dev_pm_ops intel_sst_pm; 38 45 enum sst_states { 39 46 SST_FW_LOADING = 1,
-1
sound/soc/intel/atom/sst/sst_acpi.c
··· 31 31 #include <sound/soc-acpi.h> 32 32 #include <sound/soc-acpi-intel-match.h> 33 33 #include "../sst-mfld-platform.h" 34 - #include "../../common/sst-dsp.h" 35 34 #include "../../common/soc-intel-quirks.h" 36 35 #include "sst.h" 37 36
-3
sound/soc/intel/atom/sst/sst_drv_interface.c
··· 24 24 #include <asm/platform_sst_audio.h> 25 25 #include "../sst-mfld-platform.h" 26 26 #include "sst.h" 27 - #include "../../common/sst-dsp.h" 28 - 29 - 30 27 31 28 #define NUM_CODEC 2 32 29 #define MIN_FRAGMENT 2
-1
sound/soc/intel/atom/sst/sst_ipc.c
··· 24 24 #include <asm/platform_sst_audio.h> 25 25 #include "../sst-mfld-platform.h" 26 26 #include "sst.h" 27 - #include "../../common/sst-dsp.h" 28 27 29 28 struct sst_block *sst_create_block(struct intel_sst_drv *ctx, 30 29 u32 msg_id, u32 drv_id)
-1
sound/soc/intel/atom/sst/sst_loader.c
··· 29 29 #include <asm/platform_sst_audio.h> 30 30 #include "../sst-mfld-platform.h" 31 31 #include "sst.h" 32 - #include "../../common/sst-dsp.h" 33 32 34 33 void memcpy32_toio(void __iomem *dst, const void *src, int count) 35 34 {
-1
sound/soc/intel/atom/sst/sst_pvt.c
··· 26 26 #include <asm/platform_sst_audio.h> 27 27 #include "../sst-mfld-platform.h" 28 28 #include "sst.h" 29 - #include "../../common/sst-dsp.h" 30 29 31 30 int sst_shim_write(void __iomem *addr, int offset, int value) 32 31 {
-1
sound/soc/intel/atom/sst/sst_stream.c
··· 23 23 #include <asm/platform_sst_audio.h> 24 24 #include "../sst-mfld-platform.h" 25 25 #include "sst.h" 26 - #include "../../common/sst-dsp.h" 27 26 28 27 int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params) 29 28 {
-1
sound/soc/intel/boards/bytcht_es8316.c
··· 28 28 #include <sound/soc.h> 29 29 #include <sound/soc-acpi.h> 30 30 #include "../atom/sst-atom-controls.h" 31 - #include "../common/sst-dsp.h" 32 31 #include "../common/soc-intel-quirks.h" 33 32 34 33 /* jd-inv + terminating entry */
-1
sound/soc/intel/boards/bytcr_rt5640.c
··· 28 28 #include <dt-bindings/sound/rt5640.h> 29 29 #include "../../codecs/rt5640.h" 30 30 #include "../atom/sst-atom-controls.h" 31 - #include "../common/sst-dsp.h" 32 31 #include "../common/soc-intel-quirks.h" 33 32 34 33 enum {
-10
sound/soc/intel/common/sst-dsp.h
··· 12 12 #include <linux/types.h> 13 13 #include <linux/interrupt.h> 14 14 15 - /* SST Shim register map 16 - * The register naming can differ between products. Some products also 17 - * contain extra functionality. 18 - */ 19 - #define SST_CSR 0x00 20 - #define SST_ISRX 0x18 21 - #define SST_IMRX 0x28 22 - #define SST_IPCX 0x38 /* IPC IA -> SST */ 23 - #define SST_IPCD 0x40 /* IPC SST -> IA */ 24 - 25 15 struct sst_dsp; 26 16 27 17 /*