Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux-2.6

[karo-tx-linux.git] / sound / soc / samsung / Kconfig

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index 65f980ef28708689f7e554b514cbd54a8b18b3a2..f3417f2311b819bd4a3eb5590b26c338c162de05 100644 (file)
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -63,7 +63,9 @@ config SND_SOC_SAMSUNG_SMDK_WM8580
 
 config SND_SOC_SAMSUNG_SMDK_WM8994
        tristate "SoC I2S Audio support for WM8994 on SMDK"
-       depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210)
+       depends on SND_SOC_SAMSUNG && (MACH_SMDKV310 || MACH_SMDKC210 || MACH_SMDK4212)
+       depends on I2C=y && GENERIC_HARDIRQS
+       select MFD_WM8994
        select SND_SOC_WM8994
        select SND_SAMSUNG_I2S
        help
@@ -150,7 +152,9 @@ config SND_SOC_SMARTQ
 config SND_SOC_GONI_AQUILA_WM8994
        tristate "SoC I2S Audio support for AQUILA/GONI - WM8994"
        depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA)
+       depends on I2C=y && GENERIC_HARDIRQS
        select SND_SAMSUNG_I2S
+       select MFD_WM8994
        select SND_SOC_WM8994
        help
          Say Y if you want to add support for SoC audio on goni or aquila
@@ -158,7 +162,7 @@ config SND_SOC_GONI_AQUILA_WM8994
 
 config SND_SOC_SAMSUNG_SMDK_SPDIF
        tristate "SoC S/PDIF Audio support for SMDK"
-       depends on SND_SOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210 || MACH_SMDKV310)
+       depends on SND_SOC_SAMSUNG && (MACH_SMDKC100 || MACH_SMDKC110 || MACH_SMDKV210 || MACH_SMDKV310 || MACH_SMDK4212)
        select SND_SAMSUNG_SPDIF
        help
          Say Y if you want to add support for SoC S/PDIF audio on the SMDK.
@@ -173,7 +177,9 @@ config SND_SOC_SMDK_WM8580_PCM
 
 config SND_SOC_SMDK_WM8994_PCM
        tristate "SoC PCM Audio support for WM8994 on SMDK"
-       depends on SND_SOC_SAMSUNG && (MACH_SMDKC210 || MACH_SMDKV310)
+       depends on SND_SOC_SAMSUNG && (MACH_SMDKC210 || MACH_SMDKV310 || MACH_SMDK4212)
+       depends on I2C=y && GENERIC_HARDIRQS
+       select MFD_WM8994
        select SND_SOC_WM8994
        select SND_SAMSUNG_PCM
        help
@@ -187,8 +193,22 @@ config SND_SOC_SPEYSIDE
        select SND_SOC_WM9081
        select SND_SOC_WM1250_EV1
 
-config SND_SOC_SPEYSIDE_WM8962
-       tristate "Audio support for Wolfson Speyside with WM8962"
+config SND_SOC_TOBERMORY
+       tristate "Audio support for Wolfson Tobermory"
        depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
        select SND_SAMSUNG_I2S
        select SND_SOC_WM8962
+
+config SND_SOC_LOWLAND
+       tristate "Audio support for Wolfson Lowland"
+       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
+       select SND_SAMSUNG_I2S
+       select SND_SOC_WM5100
+       select SND_SOC_WM9081
+
+config SND_SOC_LITTLEMILL
+       tristate "Audio support for Wolfson Littlemill"
+       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
+       select SND_SAMSUNG_I2S
+       select MFD_WM8994
+       select SND_SOC_WM8994