]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: intel - kconfig: remove SND_SOC_INTEL_SST prompt
authorVinod Koul <vinod.koul@intel.com>
Fri, 19 Jun 2015 18:25:28 +0000 (23:55 +0530)
committerMark Brown <broonie@kernel.org>
Wed, 8 Jul 2015 18:23:50 +0000 (19:23 +0100)
The SND_SOC_INTEL_SST is for common IPC lib and this should ideally be
not selectable symbol but selected by respective machine driver So
remove the prompt and get respective machines select it

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/Kconfig

index 6f9a54af9c643a38ff6affdc362c6605d71ce01b..32262be80871f52992549217eddd5a1e32cee493 100644 (file)
@@ -26,13 +26,9 @@ config SND_SST_IPC_ACPI
        depends on ACPI
 
 config SND_SOC_INTEL_SST
-       tristate "ASoC support for Intel(R) Smart Sound Technology"
+       tristate
        select SND_SOC_INTEL_SST_ACPI if ACPI
        depends on (X86 || COMPILE_TEST)
-       help
-          This adds support for Intel(R) Smart Sound Technology (SST).
-          Say Y if you have such a device
-          If unsure select "N".
 
 config SND_SOC_INTEL_SST_ACPI
        tristate
@@ -45,9 +41,9 @@ config SND_SOC_INTEL_BAYTRAIL
 
 config SND_SOC_INTEL_HASWELL_MACH
        tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint"
-       depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C && \
-                  I2C_DESIGNWARE_PLATFORM
+       depends on X86_INTEL_LPSS && I2C && I2C_DESIGNWARE_PLATFORM
        depends on DW_DMAC_CORE
+       select SND_SOC_INTEL_SST
        select SND_SOC_INTEL_HASWELL
        select SND_SOC_RT5640
        help
@@ -58,8 +54,9 @@ config SND_SOC_INTEL_HASWELL_MACH
 
 config SND_SOC_INTEL_BYT_RT5640_MACH
        tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec"
-       depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C
+       depends on X86_INTEL_LPSS && I2C
        depends on DW_DMAC_CORE
+       select SND_SOC_INTEL_SST
        select SND_SOC_INTEL_BAYTRAIL
        select SND_SOC_RT5640
        help
@@ -68,8 +65,9 @@ config SND_SOC_INTEL_BYT_RT5640_MACH
 
 config SND_SOC_INTEL_BYT_MAX98090_MACH
        tristate "ASoC Audio driver for Intel Baytrail with MAX98090 codec"
-       depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C
+       depends on X86_INTEL_LPSS && I2C
        depends on DW_DMAC_CORE
+       select SND_SOC_INTEL_SST
        select SND_SOC_INTEL_BAYTRAIL
        select SND_SOC_MAX98090
        help
@@ -78,9 +76,10 @@ config SND_SOC_INTEL_BYT_MAX98090_MACH
 
 config SND_SOC_INTEL_BROADWELL_MACH
        tristate "ASoC Audio DSP support for Intel Broadwell Wildcatpoint"
-       depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && DW_DMAC && \
+       depends on X86_INTEL_LPSS && I2C && DW_DMAC && \
                   I2C_DESIGNWARE_PLATFORM
        depends on DW_DMAC_CORE
+       select SND_SOC_INTEL_SST
        select SND_SOC_INTEL_HASWELL
        select SND_SOC_RT286
        help