summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorolivier moysan <olivier.moysan@st.com>2017-06-19 11:09:55 +0200
committerMark Brown <broonie@kernel.org>2017-06-19 17:32:06 +0200
commit5561b66bd0297b029d2aba40b044ac191fcca98c (patch)
tree24908c0bcab544d2f3ff58a7f7d82a12c9e3c28a /sound
parentASoC: stm32: sai: add h7 support (diff)
downloadlinux-5561b66bd0297b029d2aba40b044ac191fcca98c.tar.xz
linux-5561b66bd0297b029d2aba40b044ac191fcca98c.zip
ASoC: stm32: change configuration flag
Use a specific flag for SAI and I2S interfaces, instead of common flag. Signed-off-by: olivier moysan <olivier.moysan@st.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/stm/Kconfig19
-rw-r--r--sound/soc/stm/Makefile6
2 files changed, 19 insertions, 6 deletions
diff --git a/sound/soc/stm/Kconfig b/sound/soc/stm/Kconfig
index a6372de54042..23600a5dd46f 100644
--- a/sound/soc/stm/Kconfig
+++ b/sound/soc/stm/Kconfig
@@ -1,8 +1,21 @@
-menuconfig SND_SOC_STM32
- tristate "STMicroelectronics STM32 SOC audio support"
+menu "STMicroelectronics STM32 SOC audio support"
+
+config SND_SOC_STM32_SAI
+ tristate "STM32 SAI interface (Serial Audio Interface) support"
depends on ARCH_STM32 || COMPILE_TEST
depends on SND_SOC
select SND_SOC_GENERIC_DMAENGINE_PCM
select REGMAP_MMIO
help
- Say Y if you want to enable ASoC support for STM32
+ Say Y if you want to enable SAI for STM32
+
+config SND_SOC_STM32_I2S
+ tristate "STM32 I2S interface (SPI/I2S block) support"
+ depends on ARCH_STM32 || COMPILE_TEST
+ depends on SND_SOC
+ select SND_SOC_GENERIC_DMAENGINE_PCM
+ select REGMAP_MMIO
+ help
+ Say Y if you want to enable I2S for STM32
+
+endmenu
diff --git a/sound/soc/stm/Makefile b/sound/soc/stm/Makefile
index 82519313c0b4..4140c67fa47b 100644
--- a/sound/soc/stm/Makefile
+++ b/sound/soc/stm/Makefile
@@ -1,10 +1,10 @@
# SAI
snd-soc-stm32-sai-sub-objs := stm32_sai_sub.o
-obj-$(CONFIG_SND_SOC_STM32) += snd-soc-stm32-sai-sub.o
+obj-$(CONFIG_SND_SOC_STM32_SAI) += snd-soc-stm32-sai-sub.o
snd-soc-stm32-sai-objs := stm32_sai.o
-obj-$(CONFIG_SND_SOC_STM32) += snd-soc-stm32-sai.o
+obj-$(CONFIG_SND_SOC_STM32_SAI) += snd-soc-stm32-sai.o
# I2S
snd-soc-stm32-i2s-objs := stm32_i2s.o
-obj-$(CONFIG_SND_SOC_STM32) += snd-soc-stm32-i2s.o
+obj-$(CONFIG_SND_SOC_STM32_I2S) += snd-soc-stm32-i2s.o