From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 03/10] ASoC: fsl: rename imx-pcm Kconfig options and filename
Date: Mon, 12 Mar 2012 19:58:50 +0800 [thread overview]
Message-ID: <1331553537-19789-4-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1331553537-19789-1-git-send-email-shawn.guo@linaro.org>
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>
---
sound/soc/fsl/Kconfig | 12 ++++++------
sound/soc/fsl/Makefile | 4 ++--
sound/soc/fsl/{imx-pcm-dma-mx2.c => imx-pcm-dma.c} | 0
3 files changed, 8 insertions(+), 8 deletions(-)
rename sound/soc/fsl/{imx-pcm-dma-mx2.c => imx-pcm-dma.c} (100%)
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 19856a0..e3f7509 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 36c257f..f031409 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
similarity index 100%
rename from sound/soc/fsl/imx-pcm-dma-mx2.c
rename to sound/soc/fsl/imx-pcm-dma.c
--
1.7.5.4
next prev parent reply other threads:[~2012-03-12 11:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-12 11:58 [PATCH v4] ASoC: add imx-sgtl5000 machine driver working with fsl_ssi Shawn Guo
2012-03-12 11:58 ` [PATCH v4 01/10] ASoC: fsl: separate SSI and DMA Kconfig options Shawn Guo
2012-03-12 11:58 ` [PATCH v4 02/10] ASoC: imx: merge sound/soc/imx into sound/soc/fsl Shawn Guo
2012-03-12 11:58 ` Shawn Guo [this message]
2012-03-12 11:58 ` [PATCH v4 04/10] ASoC: fsl: create fsl_utils to accommodate the common functions Shawn Guo
2012-03-12 11:58 ` [PATCH v4 05/10] ASoC: fsl: remove helper fsl_asoc_get_codec_dev_name Shawn Guo
2012-03-12 11:58 ` [PATCH v4 06/10] ASoC: fsl: check property 'compatible' for the machine name Shawn Guo
2012-03-13 23:12 ` Timur Tabi
2012-03-13 23:15 ` Mark Brown
2012-03-13 23:21 ` Shawn Guo
2012-03-12 11:58 ` [PATCH v4 07/10] ASoC: fsl: make fsl_ssi driver compilable on ARM/IMX Shawn Guo
2012-03-12 11:58 ` [PATCH v4 08/10] ASoC: fsl: remove the fatal error checking on codec-handle Shawn Guo
2012-03-12 11:58 ` [PATCH v4 09/10] ASoC: fsl: let fsl_ssi work with imx pcm and machine drivers Shawn Guo
2012-03-12 11:58 ` [PATCH v4 10/10] ASoC: fsl: add imx-sgtl5000 machine driver Shawn Guo
2012-03-14 9:01 ` [PATCH v4] ASoC: add imx-sgtl5000 machine driver working with fsl_ssi Sascha Hauer
2012-03-14 11:33 ` Shawn Guo
2012-03-14 23:02 ` Timur Tabi
2012-03-15 9:52 ` [alsa-devel] " Sascha Hauer
2012-03-15 10:18 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331553537-19789-4-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).