From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932406AbbKXWud (ORCPT ); Tue, 24 Nov 2015 17:50:33 -0500 Received: from mail-pa0-f54.google.com ([209.85.220.54]:34336 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932203AbbKXWu2 (ORCPT ); Tue, 24 Nov 2015 17:50:28 -0500 Date: Tue, 24 Nov 2015 14:50:21 -0800 From: Nicolin Chen To: Arnd Bergmann Cc: Mark Brown , Liam Girdwood , Fabio Estevam , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, "Maciej S. Szmigiero" Subject: Re: [PATCH] ASoC: fsl: clarify ac97 dependency Message-ID: <20151124225021.GA4600@Asurada-CZ80> References: <2830784.Nrm81IgjTt@wuerfel> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2830784.Nrm81IgjTt@wuerfel> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Acked-by: Nicolin Chen 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 >