From d8dd3f92a6ba11f9046df48765e6f12ad70a3946 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Wed, 12 Feb 2020 15:56:50 +0100
Subject: [PATCH] ASoC: Fix SND_SOC_ALL_CODECS imply misc fallout
Git-commit: d8dd3f92a6ba11f9046df48765e6f12ad70a3946
Patch-mainline: v5.7-rc1
References: jsc#SLE-16518
Fixes for missing miscellaneous support:
ERROR: "abx500_get_register_interruptible" [...] undefined!
ERROR: "abx500_set_register_interruptible" [...] undefined!
ERROR: "arizona_free_irq" [...] undefined!
ERROR: "arizona_request_irq" [...] undefined!
ERROR: "arizona_set_irq_wake" [...] undefined!
ERROR: "mc13xxx_reg_rmw" [...] undefined!
ERROR: "mc13xxx_reg_write" [...] undefined!
ERROR: "snd_soc_free_ac97_component" [...] undefined!
ERROR: "snd_soc_new_ac97_component" [...] undefined!
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Fixes: ea00d95200d02ece ("ASoC: Use imply for SND_SOC_ALL_CODECS")
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20200212145650.4602-4-geert@linux-m68k.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/codecs/Kconfig | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 3ef804d07dee..d957fd6980b1 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -319,6 +319,7 @@ config SND_SOC_WM_ADSP
config SND_SOC_AB8500_CODEC
tristate
+ depends on ABX500_CORE
config SND_SOC_AC97_CODEC
tristate "Build generic ASoC AC97 CODEC driver"
@@ -343,8 +344,9 @@ config SND_SOC_AD193X_I2C
select SND_SOC_AD193X
config SND_SOC_AD1980
- select REGMAP_AC97
tristate
+ depends on SND_SOC_AC97_BUS
+ select REGMAP_AC97
config SND_SOC_AD73311
tristate
@@ -646,6 +648,7 @@ config SND_SOC_CS47L15
config SND_SOC_CS47L24
tristate
+ depends on MFD_CS47L24
config SND_SOC_CS47L35
tristate
@@ -1234,6 +1237,7 @@ config SND_SOC_STA529
config SND_SOC_STAC9766
tristate
+ depends on SND_SOC_AC97_BUS
config SND_SOC_STI_SAS
tristate "codec Audio support for STI SAS codec"
@@ -1415,9 +1419,11 @@ config SND_SOC_WM5100
config SND_SOC_WM5102
tristate
+ depends on MFD_WM5102
config SND_SOC_WM5110
tristate
+ depends on MFD_WM5110
config SND_SOC_WM8350
tristate
@@ -1579,9 +1585,11 @@ config SND_SOC_WM8996
config SND_SOC_WM8997
tristate
+ depends on MFD_WM8997
config SND_SOC_WM8998
tristate
+ depends on MFD_WM8998
config SND_SOC_WM9081
tristate
@@ -1639,6 +1647,7 @@ config SND_SOC_MAX9877
config SND_SOC_MC13783
tristate
+ depends on MFD_MC13XXX
config SND_SOC_ML26124
tristate
--
2.16.4