From: richard.zhao@linaro.org (Richard Zhao)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 7/9] ARM: mxc: move audmux-v2 to sound/soc/imx
Date: Thu, 2 Feb 2012 10:12:06 +0800 [thread overview]
Message-ID: <1328148728-32258-8-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1328148728-32258-1-git-send-email-richard.zhao@linaro.org>
It's for clean up code under arch/arm.
audmux.h is shared with audmux-v1, leave it under mach/.
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
arch/arm/plat-mxc/Kconfig | 3 ---
arch/arm/plat-mxc/Makefile | 1 -
sound/soc/imx/Kconfig | 4 ++++
sound/soc/imx/Makefile | 2 ++
{arch/arm/plat-mxc => sound/soc/imx}/audmux-v2.c | 0
5 files changed, 6 insertions(+), 4 deletions(-)
rename {arch/arm/plat-mxc => sound/soc/imx}/audmux-v2.c (100%)
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index dcebb12..9e47d9c 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -91,9 +91,6 @@ config ARCH_MXC_IOMUX_V3
config ARCH_MXC_AUDMUX_V1
bool
-config ARCH_MXC_AUDMUX_V2
- bool
-
config IRAM_ALLOC
bool
select GENERIC_ALLOCATOR
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index 076db84f..0cd5d8a 100644
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -15,7 +15,6 @@ obj-$(CONFIG_MXC_PWM) += pwm.o
obj-$(CONFIG_MXC_ULPI) += ulpi.o
obj-$(CONFIG_MXC_USE_EPIT) += epit.o
obj-$(CONFIG_ARCH_MXC_AUDMUX_V1) += audmux-v1.o
-obj-$(CONFIG_ARCH_MXC_AUDMUX_V2) += audmux-v2.o
obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
obj-$(CONFIG_CPU_FREQ_IMX) += cpufreq.o
ifdef CONFIG_SND_IMX_SOC
diff --git a/sound/soc/imx/Kconfig b/sound/soc/imx/Kconfig
index 7383917..f9eb436 100644
--- a/sound/soc/imx/Kconfig
+++ b/sound/soc/imx/Kconfig
@@ -17,10 +17,14 @@ config SND_MXC_SOC_FIQ
config SND_MXC_SOC_MX2
tristate
+config SND_MXC_SOC_AUDMUXV2
+ tristate
+
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_AUDMUXV2
select SND_MXC_SOC_FIQ
help
Enable support for audio on the i.MX31ADS with the WM1133-EV1
diff --git a/sound/soc/imx/Makefile b/sound/soc/imx/Makefile
index d6d609b..703ab5e 100644
--- a/sound/soc/imx/Makefile
+++ b/sound/soc/imx/Makefile
@@ -2,10 +2,12 @@
snd-soc-imx-objs := imx-ssi.o
snd-soc-imx-fiq-objs := imx-pcm-fiq.o
snd-soc-imx-mx2-objs := imx-pcm-dma-mx2.o
+snd-soc-imx-audmuxv2-objs := audmux-v2.o
obj-$(CONFIG_SND_IMX_SOC) += snd-soc-imx.o
obj-$(CONFIG_SND_MXC_SOC_FIQ) += snd-soc-imx-fiq.o
obj-$(CONFIG_SND_MXC_SOC_MX2) += snd-soc-imx-mx2.o
+obj-$(CONFIG_SND_MXC_SOC_AUDMUXV2) += snd-soc-imx-audmuxv2.o
# i.MX Machine Support
snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
diff --git a/arch/arm/plat-mxc/audmux-v2.c b/sound/soc/imx/audmux-v2.c
similarity index 100%
rename from arch/arm/plat-mxc/audmux-v2.c
rename to sound/soc/imx/audmux-v2.c
--
1.7.5.4
next prev parent reply other threads:[~2012-02-02 2:12 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-02 2:11 [PATCH v2 0/9] imx patches when I enable imx6q sabrelite audio Richard Zhao
2012-02-02 2:12 ` [PATCH v2 1/9] ARM: mxc: make imx_dma_is_general_purpose more generic for sdma Richard Zhao
2012-02-02 2:12 ` [PATCH v2 2/9] ARM: imx6q: add cko1 clock Richard Zhao
2012-02-02 2:12 ` [PATCH v2 3/9] ARM: dts: imx6q-sabrelite: add 2p5v and 3p3v regulators Richard Zhao
2012-02-02 2:12 ` [PATCH v2 4/9] ARM: dts: imx6q-sabrelite: add sgtl5000 audio codec Richard Zhao
2012-02-02 11:24 ` Fabio Estevam
2012-02-02 13:49 ` Richard Zhao
2012-02-02 14:15 ` Fabio Estevam
2012-02-02 14:41 ` Richard Zhao
2012-02-02 2:12 ` [PATCH v2 5/9] ARM: mxc: convert audmux-v2 to a platform driver Richard Zhao
2012-02-02 2:12 ` [PATCH v2 6/9] ARM: mx31ads: add audmux device Richard Zhao
2012-02-02 8:55 ` Shawn Guo
2012-02-02 9:11 ` Shawn Guo
2012-02-02 9:24 ` Richard Zhao
2012-02-02 13:09 ` Shawn Guo
2012-02-02 13:58 ` Richard Zhao
2012-02-02 14:09 ` Mark Brown
2012-02-02 14:25 ` Shawn Guo
2012-02-03 2:15 ` Richard Zhao
2012-02-03 13:32 ` Shawn Guo
2012-02-05 4:50 ` Richard Zhao
2012-02-14 1:35 ` Richard Zhao
2012-02-14 6:06 ` Mark Brown
2012-02-14 7:34 ` Richard Zhao
2012-02-14 17:23 ` Mark Brown
2012-02-03 13:27 ` Shawn Guo
2012-02-02 12:09 ` Mark Brown
2012-02-02 13:17 ` Shawn Guo
2012-02-02 13:26 ` Mark Brown
2012-02-02 14:11 ` Shawn Guo
2012-02-02 14:16 ` Mark Brown
2012-02-02 2:12 ` Richard Zhao [this message]
2012-02-02 9:02 ` [PATCH v2 7/9] ARM: mxc: move audmux-v2 to sound/soc/imx Shawn Guo
2012-02-02 9:42 ` Richard Zhao
2012-02-02 2:12 ` [PATCH v2 8/9] ASoC: imx: add dt support for audmux-v2 Richard Zhao
2012-02-02 12:10 ` Mark Brown
2012-02-02 14:02 ` Richard Zhao
2012-02-02 2:12 ` [PATCH v2 9/9] ARM: imx6q-sabrelite: add audmux support Richard Zhao
2012-02-02 8:30 ` Shawn Guo
2012-02-02 8:22 ` Richard Zhao
2012-02-02 8:32 ` Shawn Guo
2012-02-27 7:59 ` [PATCH v2 0/9] imx patches when I enable imx6q sabrelite audio Shawn Guo
2012-02-28 12:07 ` Richard Zhao
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=1328148728-32258-8-git-send-email-richard.zhao@linaro.org \
--to=richard.zhao@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).