aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorolivier moysan <olivier.moysan@st.com>2017-06-19 05:09:55 -0400
committerMark Brown <broonie@kernel.org>2017-06-19 11:32:06 -0400
commit5561b66bd0297b029d2aba40b044ac191fcca98c (patch)
tree24908c0bcab544d2f3ff58a7f7d82a12c9e3c28a
parent03e78a242a15eca68e5c7cb606c94959382e2b18 (diff)
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>
-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 @@
1menuconfig SND_SOC_STM32 1menu "STMicroelectronics STM32 SOC audio support"
2 tristate "STMicroelectronics STM32 SOC audio support" 2
3config SND_SOC_STM32_SAI
4 tristate "STM32 SAI interface (Serial Audio Interface) support"
3 depends on ARCH_STM32 || COMPILE_TEST 5 depends on ARCH_STM32 || COMPILE_TEST
4 depends on SND_SOC 6 depends on SND_SOC
5 select SND_SOC_GENERIC_DMAENGINE_PCM 7 select SND_SOC_GENERIC_DMAENGINE_PCM
6 select REGMAP_MMIO 8 select REGMAP_MMIO
7 help 9 help
8 Say Y if you want to enable ASoC support for STM32 10 Say Y if you want to enable SAI for STM32
11
12config SND_SOC_STM32_I2S
13 tristate "STM32 I2S interface (SPI/I2S block) support"
14 depends on ARCH_STM32 || COMPILE_TEST
15 depends on SND_SOC
16 select SND_SOC_GENERIC_DMAENGINE_PCM
17 select REGMAP_MMIO
18 help
19 Say Y if you want to enable I2S for STM32
20
21endmenu
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 @@
1# SAI 1# SAI
2snd-soc-stm32-sai-sub-objs := stm32_sai_sub.o 2snd-soc-stm32-sai-sub-objs := stm32_sai_sub.o
3obj-$(CONFIG_SND_SOC_STM32) += snd-soc-stm32-sai-sub.o 3obj-$(CONFIG_SND_SOC_STM32_SAI) += snd-soc-stm32-sai-sub.o
4 4
5snd-soc-stm32-sai-objs := stm32_sai.o 5snd-soc-stm32-sai-objs := stm32_sai.o
6obj-$(CONFIG_SND_SOC_STM32) += snd-soc-stm32-sai.o 6obj-$(CONFIG_SND_SOC_STM32_SAI) += snd-soc-stm32-sai.o
7 7
8# I2S 8# I2S
9snd-soc-stm32-i2s-objs := stm32_i2s.o 9snd-soc-stm32-i2s-objs := stm32_i2s.o
10obj-$(CONFIG_SND_SOC_STM32) += snd-soc-stm32-i2s.o 10obj-$(CONFIG_SND_SOC_STM32_I2S) += snd-soc-stm32-i2s.o