aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/Kconfig
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-06 17:07:15 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-12-06 17:07:15 +0100
commit68ee93f3d058ff58f994d08be00d3aad9ec20970 (patch)
tree5fb2d14340332062e416246c5759adcaa64a2340 /sound/soc/samsung/Kconfig
parent17021fd920fb5bc97a8c81a20b208c5b38f1b0e8 (diff)
parentb99374450c03bf5081b88995d91d34fb9b2fd040 (diff)
downloadkernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.zip
kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.gz
kernel_samsung_smdk4412-68ee93f3d058ff58f994d08be00d3aad9ec20970.tar.bz2
Merge branch 'master' of fossencdi.org:kernel_samsung_smdk4412
Diffstat (limited to 'sound/soc/samsung/Kconfig')
-rw-r--r--sound/soc/samsung/Kconfig49
1 files changed, 47 insertions, 2 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index de7cd13..55332b8 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -85,7 +85,7 @@ config SND_SOC_SAMSUNG_GRANDE_WM1811
config SND_SOC_SAMSUNG_T0_WM1811
tristate "SoC I2S Audio support for WM1811 on T0"
- depends on SND_SOC_SAMSUNG && MACH_T0
+ depends on SND_SOC_SAMSUNG && (MACH_T0 || MACH_M3_USA_TMO)
select SND_SOC_WM8994
select SND_SAMSUNG_I2S
help
@@ -103,6 +103,12 @@ config SND_SOC_SAMSUNG_M3_WM1811
select SND_SOC_WM8994
select SND_SAMSUNG_I2S
+config SND_SOC_SAMSUNG_KONA_WM1811
+ tristate "SoC I2S Audio support for WM1811 on KONA"
+ depends on SND_SOC_SAMSUNG && MACH_KONA
+ select SND_SOC_WM8994
+ select SND_SAMSUNG_I2S
+
config SND_SOC_SAMSUNG_SLP_EXYNOS_WM1811
tristate "SoC I2S Audio support for WM1811 on SLP MIDAS"
depends on SND_SOC_SAMSUNG && (MACH_SLP_PQ || MACH_SLP_PQ_LTE || MACH_REDWOOD || MACH_SLP_T0_LTE)
@@ -119,12 +125,38 @@ config SND_SOC_SAMSUNG_SLP_NAPLES_WM1811
config SND_SOC_SAMSUNG_LUNGO_WM1811
tristate "SoC I2S Audio support for WM1811 on LUNGO"
- depends on SND_SOC_SAMSUNG && (MACH_P10 ||MACH_P11 || MACH_P4NOTE)
+ depends on SND_SOC_SAMSUNG && (MACH_P10 || MACH_P11 || MACH_P4NOTE)
select SND_SOC_WM8994
select SND_SAMSUNG_I2S
help
Say Y if you want to add support for SoC audio on the LUNGO.
+config SND_SOC_SAMSUNG_TAB3_WM1811
+ tristate "SoC I2S Audio support for WM1811 on TAB3"
+ depends on SND_SOC_SAMSUNG && MACH_TAB3
+ select SND_SOC_WM8994
+ select SND_SAMSUNG_I2S
+
+config SND_SOC_SAMSUNG_ZEST_WM1811
+ tristate "SoC I2S Audio support for WM1811 on ZEST"
+ depends on SND_SOC_SAMSUNG && MACH_ZEST
+ select SND_SOC_WM8994
+ select SND_SAMSUNG_I2S
+
+config SND_SOC_SAMSUNG_GD2_WM1811
+ tristate "SoC I2S Audio support for WM1811 on ZEST"
+ depends on SND_SOC_SAMSUNG && MACH_GD2
+ select SND_SOC_WM8994
+ select SND_SAMSUNG_I2S
+
+config SND_SOC_SAMSUNG_GC2PD_WM1811
+ tristate "SoC I2S Audio support for WM1811 on GC2PD"
+ depends on SND_SOC_SAMSUNG && (MACH_GC2PD || MACH_IPCAM)
+ select SND_SOC_WM8994
+ select SND_SAMSUNG_I2S
+ help
+ Say Y if you want to add support for SoC audio on the GC2PD.
+
config SND_SOC_U1_MC1N2
tristate "SoC I2S Audio support for MC1N2 on U1"
depends on SND_SOC_SAMSUNG && (MACH_U1 || MACH_PX)
@@ -144,6 +176,19 @@ config SND_SOC_SLP_TRATS_MC1N2
Samsung Exynos-4210 audio subsystem
and Yamaha MC1N2 codec.
+config SND_SOC_SAMSUNG_WATCH_YMU831
+ tristate "SoC I2S Audio support for WATCH - YMU831"
+ depends on SND_SOC_SAMSUNG && MACH_WATCH
+ select SND_SAMSUNG_I2S
+ select SND_SOC_YAMAHA_YMU831
+ help
+ Say Y if you want to add support for SoC audio on WATCH Board
+ with the YMU831
+
+config SND_USE_YMU831_LDODE_GPIO
+ bool "Use YMU831_LDODE_GPIO"
+ depends on SND_SOC_SAMSUNG && SND_SOC_YAMAHA_YMU831
+
config SND_SOC_SAMSUNG_USE_DMA_WRAPPER
bool "DMA wrapper for ALSA Platform(DMA)"