Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1276824 > unrolled thread

[PATCH] ASoC: fsl: clarify ac97 dependency

Started byArnd Bergmann <arnd@arndb.de>
First post2015-11-24 23:30 +0100
Last post2015-11-25 00:00 +0100
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] ASoC: fsl: clarify ac97 dependency Arnd Bergmann <arnd@arndb.de> - 2015-11-24 23:30 +0100
    Re: [PATCH] ASoC: fsl: clarify ac97 dependency Nicolin Chen <nicoleotsuka@gmail.com> - 2015-11-25 00:00 +0100

#1276824 — [PATCH] ASoC: fsl: clarify ac97 dependency

FromArnd Bergmann <arnd@arndb.de>
Date2015-11-24 23:30 +0100
Subject[PATCH] ASoC: fsl: clarify ac97 dependency
Message-ID<qyug2-5Jl-15@gated-at.bofh.it>
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1276881

FromNicolin Chen <nicoleotsuka@gmail.com>
Date2015-11-25 00:00 +0100
Message-ID<qyuJ4-5VD-11@gated-at.bofh.it>
In reply to#1276824
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
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web