ASoC: codecs: wm97xx: fix ac97 dependency

[ Upstream commit ee2cbe06935bfa58f1fe07dc2a2283945f4b97dc ]

A recent build fix got the dependency slightly wrong, breaking
builds with CONFIG_AC97_BUS_NEW:

WARNING: unmet direct dependencies detected for SND_SOC_WM9713
  Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
  Selected by [m]:
  - SND_SOC_ZYLONITE [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && MACH_ZYLONITE [=y] && AC97_BUS [=n]=n

WARNING: unmet direct dependencies detected for SND_SOC_WM9712
  Depends on [n]: SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_SOC_AC97_BUS [=n]
  Selected by [m]:
  - SND_PXA2XX_SOC_EM_X270 [=m] && SOUND [=y] && !UML && SND [=y] && SND_SOC [=y] && SND_PXA2XX_SOC [=m] && (MACH_EM_X270 [=n] || MACH_EXEDA [=n] || MACH_CM_X300 [=y]) && AC97_BUS [=n]=n

Change the dependency to allow either version of the AC97 library
code.

Fixes: 5a309875787d ("ASoC: Fix SND_SOC_ALL_CODECS imply ac97 fallout")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20200428212721.2877627-1-arnd@arndb.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index e60e0b6a689cdb2ca44e021f0478e308c7e75f08..8cdc68c141dc2a4b12b4687225bb3bef7e04568a 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1620,19 +1620,19 @@ config SND_SOC_WM9090
 
 config SND_SOC_WM9705
        tristate
-       depends on SND_SOC_AC97_BUS
+       depends on SND_SOC_AC97_BUS || AC97_BUS_NEW
        select REGMAP_AC97
        select AC97_BUS_COMPAT if AC97_BUS_NEW
 
 config SND_SOC_WM9712
        tristate
-       depends on SND_SOC_AC97_BUS
+       depends on SND_SOC_AC97_BUS || AC97_BUS_NEW
        select REGMAP_AC97
        select AC97_BUS_COMPAT if AC97_BUS_NEW
 
 config SND_SOC_WM9713
        tristate
-       depends on SND_SOC_AC97_BUS
+       depends on SND_SOC_AC97_BUS || AC97_BUS_NEW
        select REGMAP_AC97
        select AC97_BUS_COMPAT if AC97_BUS_NEW