[PATCH] ASoC: fsl: select SND_SOC_IMX_PCM_DMA where needed

Arnd Bergmann
2014-04-29T10:37:45Z

On Tuesday 29 April 2014 07:07:33 Alexander Shiyan wrote:
> Mon, 28 Apr 2014 23:12:14 +0200 ?? Arnd Bergmann <arnd@arndb.de>:
> > On Tuesday 29 April 2014 00:35:41 Alexander Shiyan wrote:
> > >
> > > So, I don't understand why this error happen, as well as I can not
> > > reproduce this...
> >
> > It's probably CONFIG_SND_SOC_IMX_PCM_DMA=m and CONFIG_SND_SOC_FSL_SSI=y then.
> > What is the intended behavior in this case? Should CONFIG_SND_SOC_FSL_SSI
> > be forced to be a module as well?
>
> Hmm, yes...
> I thought that I had already solved a similar problem for the earlier
> version of the patch ...

How about this?

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index fb26345..af0bb92 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -9,6 +9,7 @@ config SND_SOC_FSL_SAI

config SND_SOC_FSL_SSI
tristate "Synchronous Serial Interface module support"
+ depends on m || SND_SOC_IMX_PCM_DMA != m
help
Say Y if you want to add Synchronous Serial Interface (SSI)
support for the Freescale CPUs.
@@ -18,6 +19,7 @@ config SND_SOC_FSL_SSI
config SND_SOC_FSL_SPDIF
tristate "Sony/Philips Digital Interface module support"
select REGMAP_MMIO
+ depends on m || SND_SOC_IMX_PCM_DMA != m
help
Say Y if you want to add Sony/Philips Digital Interface (SPDIF)
support for the Freescale CPUs.