mirror of
https://github.com/torvalds/linux.git
synced 2024-11-30 16:11:38 +00:00
3c8f7710c1
The previous fix of pxa library support, which was introduced to fix the
library dependency, broke the previous SoC behavior, where a machine
code binding pxa2xx-ac97 with a coded relied on :
- sound/soc/pxa/pxa2xx-ac97.c
- sound/soc/codecs/XXX.c
For example, the mioa701_wm9713.c machine code is currently broken. The
"select ARM" statement wrongly selects the soc/arm/pxa2xx-ac97 for
compilation, as per an unfortunate fate SND_PXA2XX_AC97 is both declared
in sound/arm/Kconfig and sound/soc/pxa/Kconfig.
Fix this by ensuring that SND_PXA2XX_SOC correctly triggers the correct
pxa2xx-ac97 compilation.
Fixes: 846172dfe3 ("ASoC: fix SND_PXA2XX_LIB Kconfig warning")
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Mark Brown <broonie@kernel.org>
45 lines
893 B
Plaintext
45 lines
893 B
Plaintext
# ALSA ARM drivers
|
|
|
|
menuconfig SND_ARM
|
|
bool "ARM sound devices"
|
|
depends on ARM
|
|
default y
|
|
help
|
|
Support for sound devices specific to ARM architectures.
|
|
Drivers that are implemented on ASoC can be found in
|
|
"ALSA for SoC audio support" section.
|
|
|
|
config SND_PXA2XX_LIB
|
|
tristate
|
|
select SND_AC97_CODEC if SND_PXA2XX_LIB_AC97
|
|
select SND_DMAENGINE_PCM
|
|
|
|
config SND_PXA2XX_LIB_AC97
|
|
bool
|
|
|
|
if SND_ARM
|
|
|
|
config SND_ARMAACI
|
|
tristate "ARM PrimeCell PL041 AC Link support"
|
|
depends on ARM_AMBA
|
|
select SND_PCM
|
|
select SND_AC97_CODEC
|
|
|
|
config SND_PXA2XX_PCM
|
|
tristate
|
|
select SND_PCM
|
|
|
|
config SND_PXA2XX_AC97
|
|
tristate "AC97 driver for the Intel PXA2xx chip"
|
|
depends on ARCH_PXA
|
|
select SND_PXA2XX_PCM
|
|
select SND_AC97_CODEC
|
|
select SND_PXA2XX_LIB
|
|
select SND_PXA2XX_LIB_AC97
|
|
help
|
|
Say Y or M if you want to support any AC97 codec attached to
|
|
the PXA2xx AC97 interface.
|
|
|
|
endif # SND_ARM
|
|
|