[PATCH] ASoC: fsl: clarify ac97 dependency

[PATCH] ASoC: fsl: clarify ac97 dependency

[Arnd Bergmann]

A new randconfig build failure shows that the fsl-asoc-card module
must not be built-in when the AC97 driver is a loadable module:

sound/built-in.o: In function `fsl_asoc_card_late_probe':
:(.text+0x571d8): undefined reference to `snd_ac97_update_bits'

I couldn't come up with a nice solution, so this adds another dependency
on "X || !X", which is the Kconfig way of saying that we have an
optional dependency on something that might be a loadable module.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 50760cad9de9 ("ASoC: fsl-asoc-card: add AC'97 support")
---
The commit that introduced this was merged for 4.4-rc1, so we might
want the fix to go into 4.4 as well.

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 19c302b0d763..14dfdee05fd5 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -283,6 +283,8 @@ config SND_SOC_IMX_MC13783
 config SND_SOC_FSL_ASOC_CARD
 	tristate "Generic ASoC Sound Card with ASRC support"
 	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
 	select SND_SOC_IMX_AUDMUX
 	select SND_SOC_IMX_PCM_DMA
 	select SND_SOC_FSL_ESAI

Re: [PATCH] ASoC: fsl: clarify ac97 dependency

[Nicolin Chen]

On Tue, Nov 24, 2015 at 11:21:10PM +0100, Arnd Bergmann wrote:
> A new randconfig build failure shows that the fsl-asoc-card module
> must not be built-in when the AC97 driver is a loadable module:
> 
> sound/built-in.o: In function `fsl_asoc_card_late_probe':
> :(.text+0x571d8): undefined reference to `snd_ac97_update_bits'
> 
> I couldn't come up with a nice solution, so this adds another dependency
> on "X || !X", which is the Kconfig way of saying that we have an
> optional dependency on something that might be a loadable module.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>

Thank you

> Fixes: 50760cad9de9 ("ASoC: fsl-asoc-card: add AC'97 support")
> ---
> The commit that introduced this was merged for 4.4-rc1, so we might
> want the fix to go into 4.4 as well.
> 
> diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
> index 19c302b0d763..14dfdee05fd5 100644
> --- a/sound/soc/fsl/Kconfig
> +++ b/sound/soc/fsl/Kconfig
> @@ -283,6 +283,8 @@ config SND_SOC_IMX_MC13783
>  config SND_SOC_FSL_ASOC_CARD
>  	tristate "Generic ASoC Sound Card with ASRC support"
>  	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
>  	select SND_SOC_IMX_AUDMUX
>  	select SND_SOC_IMX_PCM_DMA
>  	select SND_SOC_FSL_ESAI
> 

Applied "ASoC: fsl: clarify ac97 dependency" to the asoc tree

[Mark Brown]

The patch

   ASoC: fsl: clarify ac97 dependency

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From ab07eaedb7ada83cc6341894dff9cd54f1af7f8b Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 24 Nov 2015 23:21:10 +0100
Subject: [PATCH] ASoC: fsl: clarify ac97 dependency

A new randconfig build failure shows that the fsl-asoc-card module
must not be built-in when the AC97 driver is a loadable module:

sound/built-in.o: In function `fsl_asoc_card_late_probe':
:(.text+0x571d8): undefined reference to `snd_ac97_update_bits'

I couldn't come up with a nice solution, so this adds another dependency
on "X || !X", which is the Kconfig way of saying that we have an
optional dependency on something that might be a loadable module.

Fixes: 50760cad9de9 ("ASoC: fsl-asoc-card: add AC'97 support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/fsl/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 19c302b0d763..14dfdee05fd5 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -283,6 +283,8 @@ config SND_SOC_IMX_MC13783
 config SND_SOC_FSL_ASOC_CARD
 	tristate "Generic ASoC Sound Card with ASRC support"
 	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
 	select SND_SOC_IMX_AUDMUX
 	select SND_SOC_IMX_PCM_DMA
 	select SND_SOC_FSL_ESAI
-- 
2.6.2