Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56cea3f1 authored by Shawn Guo's avatar Shawn Guo Committed by Mark Brown
Browse files

ASoC: imx: add an explicit Kconfig option for imx-ssi driver 



Currently ASoC:imx uses menuconfig option SND_IMX_SOC selects imx-ssi
driver, and it works because all the machine driver covered by the
menuconfig need to build imx-ssi driver in.  However, it will not work
any more if we have a imx based machine driver going into the menuconfig
while working with fsl_ssi driver (sound/soc/fsl/fsl_ssi.c) rather than
imx-ssi one.

The patch adds an explicit Kconfig option SND_SOC_IMX_SSI for imx-ssi
driver, so that it can be selected independently from the menuconfig
option SND_IMX_SOC.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 4762fbab

sound/soc/imx/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ menuconfig SND_IMX_SOC 


if SND_IMX_SOC



config SND_SOC_IMX_SSI

	tristate



config SND_SOC_IMX_PCM

	tristate
@@ -30,6 +33,7 @@ config SND_MXC_SOC_WM1133_EV1 
	select SND_SOC_WM8350

	select SND_MXC_SOC_FIQ

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_SSI

	help

	  Enable support for audio on the i.MX31ADS with the WM1133-EV1

	  PMIC board with WM8835x fitted.
@@ -40,6 +44,7 @@ config SND_SOC_MX27VIS_AIC32X4 
	select SND_SOC_TLV320AIC32X4

	select SND_MXC_SOC_MX2

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_SSI

	help

	  Say Y if you want to add support for SoC audio on Visstrim SM10

	  board with TLV320AIC32X4 codec.
@@ -51,6 +56,7 @@ config SND_SOC_PHYCORE_AC97 
	select SND_SOC_WM9712

	select SND_MXC_SOC_FIQ

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_SSI

	help

	  Say Y if you want to add support for SoC audio on Phytec phyCORE

	  and phyCARD boards in AC97 mode
@@ -65,6 +71,7 @@ config SND_SOC_EUKREA_TLV320 
	select SND_SOC_TLV320AIC23

	select SND_MXC_SOC_FIQ

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_SSI

	help

	  Enable I2S based access to the TLV320AIC23B codec attached

	  to the SSI interface

sound/soc/imx/Makefile

+2 −2
Original line number Diff line number Diff line 
# i.MX Platform Support

snd-soc-imx-objs := imx-ssi.o

snd-soc-imx-ssi-objs := imx-ssi.o

snd-soc-imx-audmux-objs := imx-audmux.o



obj-$(CONFIG_SND_IMX_SOC) += snd-soc-imx.o

obj-$(CONFIG_SND_SOC_IMX_SSI) += snd-soc-imx-ssi.o

obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o



obj-$(CONFIG_SND_SOC_IMX_PCM) += snd-soc-imx-pcm.o