2019-02-19 14:53:21

by Arnd Bergmann

Subject: [PATCH] ARM: pxa: remove CONFIG_SND_PXA2XX_AC97 in pxa_defconfig

The CONFIG_SND_PXA2XX_AC97 driver is for the old AC97 bus implementation,
and conflicts with all the new-style AC97 drivers after the conversion,
so the drivers we want all get turned off.

Not disabling the symbol however does the right thing, and we get
the drivers that are selectively enabled here.

Fixes: 25540f68c871 ("ASoC: pxa: change ac97 dependencies")
Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/arm/configs/pxa_defconfig | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig
index 6bb506edb1f5..7f0f1fda2584 100644
--- a/arch/arm/configs/pxa_defconfig
+++ b/arch/arm/configs/pxa_defconfig
@@ -482,7 +482,6 @@ CONFIG_SND_PCM_OSS=m
CONFIG_SND_DYNAMIC_MINORS=y
CONFIG_SND_VERBOSE_PRINTK=y
CONFIG_SND_DEBUG=y
-CONFIG_SND_PXA2XX_AC97=m
CONFIG_SND_USB_AUDIO=m
CONFIG_SND_SOC=m
CONFIG_SND_ATMEL_SOC=m
--
2.20.0

2019-02-27 22:02:20

by Robert Jarzmik

Subject: Re: [PATCH] ARM: pxa: remove CONFIG_SND_PXA2XX_AC97 in pxa_defconfig

Arnd Bergmann <[email protected]> writes:

> The CONFIG_SND_PXA2XX_AC97 driver is for the old AC97 bus implementation,
> and conflicts with all the new-style AC97 drivers after the conversion,
> so the drivers we want all get turned off.
>
> Not disabling the symbol however does the right thing, and we get
> the drivers that are selectively enabled here.
>
> Fixes: 25540f68c871 ("ASoC: pxa: change ac97 dependencies")
> Signed-off-by: Arnd Bergmann <[email protected]>
Yes, most certainly.

Acked-by: Robert Jarzmik <[email protected]>

Cheers.

--
Robert

2019-03-01 14:05:42

by Arnd Bergmann

Subject: Re: [PATCH] ARM: pxa: remove CONFIG_SND_PXA2XX_AC97 in pxa_defconfig

On Wed, Feb 27, 2019 at 11:01 PM Robert Jarzmik <[email protected]> wrote:
>
> Arnd Bergmann <[email protected]> writes:
>
> > The CONFIG_SND_PXA2XX_AC97 driver is for the old AC97 bus implementation,
> > and conflicts with all the new-style AC97 drivers after the conversion,
> > so the drivers we want all get turned off.
> >
> > Not disabling the symbol however does the right thing, and we get
> > the drivers that are selectively enabled here.
> >
> > Fixes: 25540f68c871 ("ASoC: pxa: change ac97 dependencies")
> > Signed-off-by: Arnd Bergmann <[email protected]>
> Yes, most certainly.
>
> Acked-by: Robert Jarzmik <[email protected]>

Applied to arm/defconfig for 5.1 now, thanks for taking a look

Arnd