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

Configure Feed

Select the types of activity you want to include in your feed.

ASoC: fsl_sai: add IMX_SCMI_MISC_DRV dependency

The sai driver now links against the SCMI code directly, causing a
link failure when that is in a loadable module:

aarch64-linux-ld: sound/soc/fsl/fsl_sai.o: in function `fsl_sai_probe':
fsl_sai.c:(.text+0x1fe4): undefined reference to `scmi_imx_misc_ctrl_set'

Move the dependency from SND_SOC_FSL_MQS to SND_SOC_FSL_SAI. The MQS
driver depends on the SAI one, so it still gets the same dependency
indirectly.

All other drivers that select the SAI symbol need the same dependency
in turn, though that could probably get replaced with a 'depends on
SND_SOC_FSL_SAI' to keep it simpler.

Fixes: 19b08fd23b20 ("ASoC: fsl_sai: Add AUDMIX mode support on i.MX952")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patch.msgid.link/20260202095353.1233963-1-arnd@kernel.org
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Arnd Bergmann and committed by
Mark Brown 742048f2 cad9720d

+5 -1
+5 -1
sound/soc/fsl/Kconfig
··· 19 19 20 20 config SND_SOC_FSL_SAI 21 21 tristate "Synchronous Audio Interface (SAI) module support" 22 + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV 22 23 select REGMAP_MMIO 23 24 select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n 24 25 select SND_SOC_GENERIC_DMAENGINE_PCM ··· 33 32 config SND_SOC_FSL_MQS 34 33 tristate "Medium Quality Sound (MQS) module support" 35 34 depends on SND_SOC_FSL_SAI 36 - depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV 37 35 select REGMAP_MMIO 38 36 help 39 37 Say Y if you want to add Medium Quality Sound (MQS) ··· 309 309 310 310 config SND_SOC_FSL_ASOC_CARD 311 311 tristate "Generic ASoC Sound Card with ASRC support" 312 + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV 312 313 depends on OF && I2C 313 314 # enforce SND_SOC_FSL_ASOC_CARD=m if SND_AC97_CODEC=m: 314 315 depends on SND_AC97_CODEC || SND_AC97_CODEC=n ··· 331 330 332 331 config SND_SOC_IMX_AUDMIX 333 332 tristate "SoC Audio support for i.MX boards with AUDMIX" 333 + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV 334 334 select SND_SOC_FSL_AUDMIX 335 335 select SND_SOC_FSL_SAI 336 336 help ··· 341 339 342 340 config SND_SOC_IMX_HDMI 343 341 tristate "SoC Audio support for i.MX boards with HDMI port" 342 + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV 344 343 select SND_SOC_FSL_SAI 345 344 select SND_SOC_FSL_AUD2HTX 346 345 select SND_SOC_HDMI_CODEC ··· 367 364 config SND_SOC_IMX_CARD 368 365 tristate "SoC Audio Graph Sound Card support for i.MX boards" 369 366 depends on OF && I2C 367 + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV 370 368 select SND_SOC_AK4458 371 369 select SND_SOC_AK5558 372 370 select SND_SOC_IMX_PCM_DMA