ASoC: Intel: boards: remove explicit dependency on GPIOLIB when DMIC is used"

This patch reverts commit 3ed56c040e88 ("ASoC: Intel: boards: add
explicit dependency on GPIOLIB when DMIC is used") and all follow-up
additions of this dependency.

Now that the DMIC does not depend on GPIOLIB we can simplify again.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Link: https://lore.kernel.org/r/20220304204532.54675-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/Kconfig b/sound/soc/intel/boards/Kconfig
index da59504d2322ec57b92c037f4e2e84a0c8b952b9..b0baf3fce05b4941fb2123ff32b4363b5f92873d 100644 (file)
--- a/sound/soc/intel/boards/Kconfig
+++ b/sound/soc/intel/boards/Kconfig
@@ -242,7 +242,7 @@ if SND_SOC_INTEL_SKL
 
 config SND_SOC_INTEL_SKL_RT286_MACH
        tristate "SKL with RT286 I2S mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_RT286
        select SND_SOC_DMIC
@@ -255,7 +255,7 @@ config SND_SOC_INTEL_SKL_RT286_MACH
 
 config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
        tristate "SKL with NAU88L25 and SSM4567 in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_NAU8825
        select SND_SOC_SSM4567
@@ -269,7 +269,7 @@ config SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH
 
 config SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH
        tristate "SKL with NAU88L25 and MAX98357A in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_NAU8825
        select SND_SOC_MAX98357A
@@ -300,7 +300,7 @@ if SND_SOC_INTEL_APL
 
 config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
        tristate "Broxton with DA7219 and MAX98357A/MAX98390 in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        depends on SND_HDA_CODEC_HDMI
        select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
@@ -312,7 +312,7 @@ config SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH
 
 config SND_SOC_INTEL_BXT_RT298_MACH
        tristate "Broxton with RT298 I2S mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_RT298
        select SND_SOC_DMIC
@@ -345,7 +345,7 @@ if SND_SOC_INTEL_KBL
 
 config SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH
        tristate "KBL with RT5663 and MAX98927 in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_RT5663
        select SND_SOC_MAX98927
@@ -377,7 +377,7 @@ config SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH
 
 config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
        tristate "KBL with DA7219 and MAX98357A in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_INTEL_DA7219_MAX98357A_GENERIC
        help
@@ -387,7 +387,7 @@ config SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH
 
 config SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH
        tristate "KBL with DA7219 and MAX98927 in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_DA7219
        select SND_SOC_MAX98927
@@ -417,7 +417,7 @@ if SND_SOC_SOF_GEMINILAKE
 
 config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
        tristate "GLK with DA7219 and MAX98357A in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
        select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
@@ -429,7 +429,7 @@ config SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH
 
 config SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH
        tristate "GLK with RT5682 and MAX98357A in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
        select SND_SOC_RT5682_I2C
@@ -451,7 +451,6 @@ if SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
 config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
        tristate "Skylake+ with HDA Codecs"
        depends on SND_HDA_CODEC_HDMI
-       depends on GPIOLIB
        select SND_SOC_HDAC_HDMI
        select SND_SOC_INTEL_HDA_DSP_COMMON
        select SND_SOC_DMIC
@@ -468,7 +467,7 @@ endif ## SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC || SND_SOC_SOF_HDA_AUDIO_CODEC
 if SND_SOC_SOF_HDA_LINK || SND_SOC_SOF_BAYTRAIL
 config SND_SOC_INTEL_SOF_RT5682_MACH
        tristate "SOF with rt5682 codec in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\
                    (MFD_INTEL_LPSS || COMPILE_TEST)) ||\
                   (SND_SOC_SOF_BAYTRAIL && (X86_INTEL_LPSS || COMPILE_TEST))
@@ -537,7 +536,7 @@ config SND_SOC_INTEL_SOF_ES8336_MACH
 
 config SND_SOC_INTEL_SOF_NAU8825_MACH
        tristate "SOF with nau8825 codec in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on ((SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC) &&\
                    (MFD_INTEL_LPSS || COMPILE_TEST))
        select SND_SOC_NAU8825
@@ -560,7 +559,7 @@ if (SND_SOC_SOF_COMETLAKE && SND_SOC_SOF_HDA_LINK)
 
 config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
        tristate "CML_LP with DA7219 and MAX98357A in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON
        help
@@ -571,7 +570,7 @@ config SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH
 
 config SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH
        tristate "CML with RT1011 and RT5682 in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
        select SND_SOC_RT1011
@@ -591,7 +590,7 @@ if SND_SOC_SOF_JASPERLAKE
 
 config SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH
        tristate "SOF with DA7219 and MAX98373/MAX98360A in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
        select SND_SOC_INTEL_HDA_DSP_COMMON
@@ -608,7 +607,7 @@ endif ## SND_SOC_SOF_JASPERLAKE
 
 config SND_SOC_INTEL_SOF_SSP_AMP_MACH
        tristate "SOF with amplifiers in I2S Mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        select SND_SOC_RT1308
        select SND_SOC_CS35L41_I2C
@@ -627,7 +626,7 @@ if SND_SOC_SOF_ELKHARTLAKE
 
 config SND_SOC_INTEL_EHL_RT5660_MACH
        tristate "EHL with RT5660 in I2S mode"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        depends on SND_HDA_CODEC_HDMI && SND_SOC_SOF_HDA_AUDIO_CODEC
        select SND_SOC_RT5660
@@ -643,7 +642,7 @@ if SND_SOC_SOF_INTEL_SOUNDWIRE
 
 config SND_SOC_INTEL_SOUNDWIRE_SOF_MACH
        tristate "SoundWire generic machine driver"
-       depends on I2C && ACPI && GPIOLIB
+       depends on I2C && ACPI
        depends on MFD_INTEL_LPSS || COMPILE_TEST
        depends on SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES || COMPILE_TEST
        depends on SOUNDWIRE