summaryrefslogtreecommitdiff
path: root/sound/soc/fsl
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-03-16 12:56:39 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-04-01 14:28:26 +0400
commitf19493a3d25ddf3ac7f27d846d54e95fb91af119 (patch)
treeea947deb1db8288cae814f9e5d47f19d8951b787 /sound/soc/fsl
parenta23dc694828e3de96bf18e20459ba885ba91cb29 (diff)
downloadlinux-f19493a3d25ddf3ac7f27d846d54e95fb91af119.tar.xz
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: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Timur Tabi <timur@freescale.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/fsl')
-rw-r--r--sound/soc/fsl/Kconfig12
-rw-r--r--sound/soc/fsl/Makefile4
-rw-r--r--sound/soc/fsl/imx-pcm-dma.c (renamed from sound/soc/fsl/imx-pcm-dma-mx2.c)0
3 files changed, 8 insertions, 8 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 19856a05208c..e3f75093d197 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -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
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile
index 36c257fd35bb..f031409a3929 100644
--- a/sound/soc/fsl/Makefile
+++ b/sound/soc/fsl/Makefile
@@ -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
diff --git a/sound/soc/fsl/imx-pcm-dma-mx2.c b/sound/soc/fsl/imx-pcm-dma.c
index 6b818de2fc03..6b818de2fc03 100644
--- a/sound/soc/fsl/imx-pcm-dma-mx2.c
+++ b/sound/soc/fsl/imx-pcm-dma.c