Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit bec5ecdf authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown
Browse files

ASoC: pxa: avoid AC97_BUS build warning 



Selecting AC97_BUS_NEW from SND_PXA2XX_SOC_AC97 leads to a Kconfig
warning if any other driver selects AC97_BUS:

WARNING: unmet direct dependencies detected for AC97_BUS_COMPAT
  Depends on [n]: SOUND [=y] && !UML && SND [=y] && AC97_BUS_NEW [=y] && !AC97_BUS [=y]
  Selected by [y]:
  - SND_SOC_WM9713 [=y] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && AC97_BUS_NEW [=y]

I don't know if that combination is supposed to work.
Assuming it is not, this adds a dependency on all users
for PXA to avoids the combination.

Fixes: 1c8bc7b3 ("ASoC: pxa: switch to new ac97 bus support")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 42cfb412

sound/soc/pxa/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ config SND_PXA2XX_SOC_TOSA 
	tristate "SoC AC97 Audio support for Tosa"

	depends on SND_PXA2XX_SOC && MACH_TOSA

	depends on MFD_TC6393XB

	depends on !AC97_BUS

	select SND_PXA2XX_SOC_AC97

	select SND_SOC_WM9712

	help
@@ -88,6 +89,7 @@ config SND_PXA2XX_SOC_TOSA 
config SND_PXA2XX_SOC_E740

	tristate "SoC AC97 Audio support for e740"

	depends on SND_PXA2XX_SOC && MACH_E740

	depends on !AC97_BUS

	select SND_SOC_WM9705

	select SND_PXA2XX_SOC_AC97

	help
@@ -97,6 +99,7 @@ config SND_PXA2XX_SOC_E740 
config SND_PXA2XX_SOC_E750

	tristate "SoC AC97 Audio support for e750"

	depends on SND_PXA2XX_SOC && MACH_E750

	depends on !AC97_BUS

	select SND_SOC_WM9705

	select SND_PXA2XX_SOC_AC97

	help
@@ -106,6 +109,7 @@ config SND_PXA2XX_SOC_E750 
config SND_PXA2XX_SOC_E800

	tristate "SoC AC97 Audio support for e800"

	depends on SND_PXA2XX_SOC && MACH_E800

	depends on !AC97_BUS

	select SND_SOC_WM9712

	select SND_PXA2XX_SOC_AC97

	help
@@ -116,6 +120,7 @@ config SND_PXA2XX_SOC_EM_X270 
	tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300"

	depends on SND_PXA2XX_SOC && (MACH_EM_X270 || MACH_EXEDA || \

			MACH_CM_X300)

	depends on !AC97_BUS

	select SND_PXA2XX_SOC_AC97

	select SND_SOC_WM9712

	help
@@ -126,6 +131,7 @@ config SND_PXA2XX_SOC_PALM27X 
	bool "SoC Audio support for Palm T|X, T5, E2 and LifeDrive"

	depends on SND_PXA2XX_SOC && (MACH_PALMLD || MACH_PALMTX || \

			MACH_PALMT5 || MACH_PALMTE2)

	depends on !AC97_BUS

	select SND_PXA2XX_SOC_AC97

	select SND_SOC_WM9712

	help
@@ -155,6 +161,7 @@ config SND_SOC_TTC_DKB 
config SND_SOC_ZYLONITE

	tristate "SoC Audio support for Marvell Zylonite"

	depends on SND_PXA2XX_SOC && MACH_ZYLONITE

	depends on !AC97_BUS

	select SND_PXA2XX_SOC_AC97

	select SND_PXA_SOC_SSP

	select SND_SOC_WM9713
@@ -194,6 +201,7 @@ config SND_PXA2XX_SOC_MAGICIAN 
config SND_PXA2XX_SOC_MIOA701

        tristate "SoC Audio support for MIO A701"

        depends on SND_PXA2XX_SOC && MACH_MIOA701

	depends on !AC97_BUS

        select SND_PXA2XX_SOC_AC97

        select SND_SOC_WM9713

        help