Skip to content

Commit

Permalink
ASoC: fsl: rename imx-pcm Kconfig options and filename
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Shawn Guo authored and Mark Brown committed Apr 1, 2012
1 parent a23dc69 commit f19493a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions sound/soc/fsl/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions sound/soc/fsl/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 sound/soc/fsl/imx-pcm-dma-mx2.c → sound/soc/fsl/imx-pcm-dma.c
View file
File renamed without changes.

0 comments on commit f19493a

Please sign in to comment.