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

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

ASoC: fsl: rename imx-pcm Kconfig options and filename 



Rename a couple of imx-pcm Kconfig options and filename to get them
well named and less confusing.

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

sound/soc/fsl/Kconfig

+6 −6
Original line number Diff line number Diff line
@@ -97,12 +97,12 @@ config SND_SOC_IMX_SSI 
config SND_SOC_IMX_PCM

	tristate



config SND_MXC_SOC_FIQ

config SND_SOC_IMX_PCM_FIQ

	tristate

	select FIQ

	select SND_SOC_IMX_PCM



config SND_MXC_SOC_MX2

config SND_SOC_IMX_PCM_DMA

	tristate

	select SND_SOC_DMAENGINE_PCM

	select SND_SOC_IMX_PCM
@@ -114,7 +114,7 @@ config SND_MXC_SOC_WM1133_EV1 
	tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"

	depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL

	select SND_SOC_WM8350

	select SND_MXC_SOC_FIQ

	select SND_SOC_IMX_PCM_FIQ

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_SSI

	help
@@ -125,7 +125,7 @@ config SND_SOC_MX27VIS_AIC32X4 
	tristate "SoC audio support for Visstrim M10 boards"

	depends on MACH_IMX27_VISSTRIM_M10 && I2C

	select SND_SOC_TLV320AIC32X4

	select SND_MXC_SOC_MX2

	select SND_SOC_IMX_PCM_DMA

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_SSI

	help
@@ -137,7 +137,7 @@ config SND_SOC_PHYCORE_AC97 
	depends on MACH_PCM043 || MACH_PCA100

	select SND_SOC_AC97_BUS

	select SND_SOC_WM9712

	select SND_MXC_SOC_FIQ

	select SND_SOC_IMX_PCM_FIQ

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_SSI

	help
@@ -152,7 +152,7 @@ config SND_SOC_EUKREA_TLV320 
		|| MACH_EUKREA_MBIMXSD51_BASEBOARD

	depends on I2C

	select SND_SOC_TLV320AIC23

	select SND_MXC_SOC_FIQ

	select SND_SOC_IMX_PCM_FIQ

	select SND_SOC_IMX_AUDMUX

	select SND_SOC_IMX_SSI

	help

sound/soc/fsl/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ obj-$(CONFIG_SND_SOC_IMX_AUDMUX) += snd-soc-imx-audmux.o 


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

snd-soc-imx-pcm-y := imx-pcm.o

snd-soc-imx-pcm-$(CONFIG_SND_MXC_SOC_FIQ) += imx-pcm-fiq.o

snd-soc-imx-pcm-$(CONFIG_SND_MXC_SOC_MX2) += imx-pcm-dma-mx2.o

snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_FIQ) += imx-pcm-fiq.o

snd-soc-imx-pcm-$(CONFIG_SND_SOC_IMX_PCM_DMA) += imx-pcm-dma.o



# i.MX Machine Support

snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o