Merge remote-tracking branch 'asoc/topic/fsl-ssi' into asoc-next (1ecf4450) · Commits · 戴 / test

sound/soc/fsl/Kconfig

+2 −6

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@ config SND_SOC_FSL_SSI
	tristate "Synchronous Serial Interface module support"		tristate "Synchronous Serial Interface module support"
	select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n		select SND_SOC_IMX_PCM_DMA if SND_IMX_SOC != n
	select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && ARCH_MXC		select SND_SOC_IMX_PCM_FIQ if SND_IMX_SOC != n && ARCH_MXC
			select REGMAP_MMIO
	help		help
	Say Y if you want to add Synchronous Serial Interface (SSI)		Say Y if you want to add Synchronous Serial Interface (SSI)
	support for the Freescale CPUs.		support for the Freescale CPUs.
	@@ -207,12 +208,7 @@ config SND_SOC_PHYCORE_AC97

	config SND_SOC_EUKREA_TLV320		config SND_SOC_EUKREA_TLV320
	tristate "Eukrea TLV320"		tristate "Eukrea TLV320"
	depends on MACH_EUKREA_MBIMX27_BASEBOARD \		depends on ARCH_MXC && I2C
	\|\| MACH_EUKREA_MBIMXSD25_BASEBOARD \
	\|\| MACH_EUKREA_MBIMXSD35_BASEBOARD \
	\|\| MACH_EUKREA_MBIMXSD51_BASEBOARD \
	\|\| (OF && ARM)
	depends on I2C
	select SND_SOC_TLV320AIC23_I2C		select SND_SOC_TLV320AIC23_I2C
	select SND_SOC_IMX_AUDMUX		select SND_SOC_IMX_AUDMUX
	select SND_SOC_IMX_SSI		select SND_SOC_IMX_SSI