| Message ID | 1497615334-7156-3-git-send-email-olivier.moysan@st.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Jun 16, 2017 at 02:15:29PM +0200, olivier moysan wrote: > Use a specific flag for SAI interface instead > of common stm32 asoc flag. This doesn't apply against current code, please check and resend.
Hello Mark, On 06/16/2017 07:49 PM, Mark Brown wrote: > On Fri, Jun 16, 2017 at 02:15:29PM +0200, olivier moysan wrote: >> Use a specific flag for SAI interface instead >> of common stm32 asoc flag. > > This doesn't apply against current code, please check and resend. > I pushed this patch-set on stm topic branch. I resend a patch on next, to fix the merge issue. Best regards olivier
diff --git a/sound/soc/stm/Kconfig b/sound/soc/stm/Kconfig index 972970f..d747993 100644 --- a/sound/soc/stm/Kconfig +++ b/sound/soc/stm/Kconfig @@ -1,8 +1,12 @@ -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 + +endmenu diff --git a/sound/soc/stm/Makefile b/sound/soc/stm/Makefile index e466a47..386ce4b 100644 --- a/sound/soc/stm/Makefile +++ b/sound/soc/stm/Makefile @@ -1,6 +1,6 @@ # 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
Use a specific flag for SAI interface instead of common stm32 asoc flag. Signed-off-by: olivier moysan <olivier.moysan@st.com> --- sound/soc/stm/Kconfig | 10 +++++++--- sound/soc/stm/Makefile | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-)