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

ASoC: SOF: intel: add sdw_shim/alh_base to sof_intel_dsp_desc

sdw_shim_base and sdw_alh_base are platform-dependent. This change allow
us to define different sdw shim/alh base for each platform.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20210723115451.7245-3-yung-chuan.liao@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Bard Liao and committed by
Mark Brown
1cbf6443 f0163958

+16
+4
sound/soc/sof/intel/cnl.c
··· 347 347 .rom_init_timeout = 300, 348 348 .ssp_count = CNL_SSP_COUNT, 349 349 .ssp_base_offset = CNL_SSP_BASE_OFFSET, 350 + .sdw_shim_base = SDW_SHIM_BASE, 351 + .sdw_alh_base = SDW_ALH_BASE, 350 352 }; 351 353 EXPORT_SYMBOL_NS(cnl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON); 352 354 ··· 365 363 .rom_init_timeout = 300, 366 364 .ssp_count = ICL_SSP_COUNT, 367 365 .ssp_base_offset = CNL_SSP_BASE_OFFSET, 366 + .sdw_shim_base = SDW_SHIM_BASE, 367 + .sdw_alh_base = SDW_ALH_BASE, 368 368 }; 369 369 EXPORT_SYMBOL_NS(jsl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);
+2
sound/soc/sof/intel/icl.c
··· 142 142 .rom_init_timeout = 300, 143 143 .ssp_count = ICL_SSP_COUNT, 144 144 .ssp_base_offset = CNL_SSP_BASE_OFFSET, 145 + .sdw_shim_base = SDW_SHIM_BASE, 146 + .sdw_alh_base = SDW_ALH_BASE, 145 147 }; 146 148 EXPORT_SYMBOL_NS(icl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);
+2
sound/soc/sof/intel/shim.h
··· 164 164 int rom_init_timeout; 165 165 int ssp_count; /* ssp count of the platform */ 166 166 int ssp_base_offset; /* base address of the SSPs */ 167 + u32 sdw_shim_base; 168 + u32 sdw_alh_base; 167 169 }; 168 170 169 171 extern const struct snd_sof_dsp_ops sof_tng_ops;
+8
sound/soc/sof/intel/tgl.c
··· 137 137 .rom_init_timeout = 300, 138 138 .ssp_count = ICL_SSP_COUNT, 139 139 .ssp_base_offset = CNL_SSP_BASE_OFFSET, 140 + .sdw_shim_base = SDW_SHIM_BASE, 141 + .sdw_alh_base = SDW_ALH_BASE, 140 142 }; 141 143 EXPORT_SYMBOL_NS(tgl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON); 142 144 ··· 155 153 .rom_init_timeout = 300, 156 154 .ssp_count = ICL_SSP_COUNT, 157 155 .ssp_base_offset = CNL_SSP_BASE_OFFSET, 156 + .sdw_shim_base = SDW_SHIM_BASE, 157 + .sdw_alh_base = SDW_ALH_BASE, 158 158 }; 159 159 EXPORT_SYMBOL_NS(tglh_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON); 160 160 ··· 173 169 .rom_init_timeout = 300, 174 170 .ssp_count = ICL_SSP_COUNT, 175 171 .ssp_base_offset = CNL_SSP_BASE_OFFSET, 172 + .sdw_shim_base = SDW_SHIM_BASE, 173 + .sdw_alh_base = SDW_ALH_BASE, 176 174 }; 177 175 EXPORT_SYMBOL_NS(ehl_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON); 178 176 ··· 191 185 .rom_init_timeout = 300, 192 186 .ssp_count = ICL_SSP_COUNT, 193 187 .ssp_base_offset = CNL_SSP_BASE_OFFSET, 188 + .sdw_shim_base = SDW_SHIM_BASE, 189 + .sdw_alh_base = SDW_ALH_BASE, 194 190 }; 195 191 EXPORT_SYMBOL_NS(adls_chip_info, SND_SOC_SOF_INTEL_HDA_COMMON);