Skip to content

Commit 742048f

Browse files
arndbbroonie
authored andcommitted
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: 19b08fd ("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>
1 parent cad9720 commit 742048f

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

sound/soc/fsl/Kconfig

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ config SND_SOC_FSL_ASRC
1919

2020
config SND_SOC_FSL_SAI
2121
tristate "Synchronous Audio Interface (SAI) module support"
22+
depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV
2223
select REGMAP_MMIO
2324
select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
2425
select SND_SOC_GENERIC_DMAENGINE_PCM
@@ -32,7 +33,6 @@ config SND_SOC_FSL_SAI
3233
config SND_SOC_FSL_MQS
3334
tristate "Medium Quality Sound (MQS) module support"
3435
depends on SND_SOC_FSL_SAI
35-
depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV
3636
select REGMAP_MMIO
3737
help
3838
Say Y if you want to add Medium Quality Sound (MQS)
@@ -309,6 +309,7 @@ config SND_SOC_IMX_SGTL5000
309309

310310
config SND_SOC_FSL_ASOC_CARD
311311
tristate "Generic ASoC Sound Card with ASRC support"
312+
depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV
312313
depends on OF && I2C
313314
# enforce SND_SOC_FSL_ASOC_CARD=m if SND_AC97_CODEC=m:
314315
depends on SND_AC97_CODEC || SND_AC97_CODEC=n
@@ -330,6 +331,7 @@ config SND_SOC_FSL_ASOC_CARD
330331

331332
config SND_SOC_IMX_AUDMIX
332333
tristate "SoC Audio support for i.MX boards with AUDMIX"
334+
depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV
333335
select SND_SOC_FSL_AUDMIX
334336
select SND_SOC_FSL_SAI
335337
help
@@ -339,6 +341,7 @@ config SND_SOC_IMX_AUDMIX
339341

340342
config SND_SOC_IMX_HDMI
341343
tristate "SoC Audio support for i.MX boards with HDMI port"
344+
depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV
342345
select SND_SOC_FSL_SAI
343346
select SND_SOC_FSL_AUD2HTX
344347
select SND_SOC_HDMI_CODEC
@@ -364,6 +367,7 @@ config SND_SOC_IMX_RPMSG
364367
config SND_SOC_IMX_CARD
365368
tristate "SoC Audio Graph Sound Card support for i.MX boards"
366369
depends on OF && I2C
370+
depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV
367371
select SND_SOC_AK4458
368372
select SND_SOC_AK5558
369373
select SND_SOC_IMX_PCM_DMA

0 commit comments

Comments
 (0)