From: Arnd Bergmann Date: Mon, 2 Feb 2026 09:53:50 +0000 (+0100) Subject: ASoC: fsl_sai: add IMX_SCMI_MISC_DRV dependency X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=742048f2e128c06d0ef89ffc334519cb8e991f66;p=thirdparty%2Fkernel%2Flinux.git 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 Link: https://patch.msgid.link/20260202095353.1233963-1-arnd@kernel.org Signed-off-by: Mark Brown --- diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index c4a00b22bc2a..828524c90f17 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -19,6 +19,7 @@ config SND_SOC_FSL_ASRC config SND_SOC_FSL_SAI tristate "Synchronous Audio Interface (SAI) module support" + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV select REGMAP_MMIO select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n select SND_SOC_GENERIC_DMAENGINE_PCM @@ -32,7 +33,6 @@ config SND_SOC_FSL_SAI config SND_SOC_FSL_MQS tristate "Medium Quality Sound (MQS) module support" depends on SND_SOC_FSL_SAI - depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV select REGMAP_MMIO help Say Y if you want to add Medium Quality Sound (MQS) @@ -309,6 +309,7 @@ config SND_SOC_IMX_SGTL5000 config SND_SOC_FSL_ASOC_CARD tristate "Generic ASoC Sound Card with ASRC support" + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV depends on OF && I2C # enforce SND_SOC_FSL_ASOC_CARD=m if SND_AC97_CODEC=m: depends on SND_AC97_CODEC || SND_AC97_CODEC=n @@ -330,6 +331,7 @@ config SND_SOC_FSL_ASOC_CARD config SND_SOC_IMX_AUDMIX tristate "SoC Audio support for i.MX boards with AUDMIX" + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV select SND_SOC_FSL_AUDMIX select SND_SOC_FSL_SAI help @@ -339,6 +341,7 @@ config SND_SOC_IMX_AUDMIX config SND_SOC_IMX_HDMI tristate "SoC Audio support for i.MX boards with HDMI port" + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV select SND_SOC_FSL_SAI select SND_SOC_FSL_AUD2HTX select SND_SOC_HDMI_CODEC @@ -364,6 +367,7 @@ config SND_SOC_IMX_RPMSG config SND_SOC_IMX_CARD tristate "SoC Audio Graph Sound Card support for i.MX boards" depends on OF && I2C + depends on IMX_SCMI_MISC_DRV || !IMX_SCMI_MISC_DRV select SND_SOC_AK4458 select SND_SOC_AK5558 select SND_SOC_IMX_PCM_DMA