summaryrefslogtreecommitdiffstats
path: root/sound/soc/imx/Makefile
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2012-03-05 15:30:55 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-06 01:03:08 +0100
commit4762fbab0b1cf1d4f3e02b78351dc6fa59ca564e (patch)
tree08c59b48b0b3f7e24f84820683f9961e5664da90 /sound/soc/imx/Makefile
parentASoC: imx: rename audmux prefix mxc to imx (diff)
downloadlinux-4762fbab0b1cf1d4f3e02b78351dc6fa59ca564e.tar.xz
linux-4762fbab0b1cf1d4f3e02b78351dc6fa59ca564e.zip
ASoC: imx: separate imx-pcm bits from imx-ssi driver
Currently the imx-ssi.c[h] accommodates the imx-pcm common bits which are shared between imx-pcm-dma-mx2 and imx-pcm-fiq drivers. It assumes that imx-pcm-dma-mx2 and imx-pcm-fiq will always be used together with imx-ssi driver. However this becomes untrue when we see that driver sound/soc/fsl/fsl_ssi could possibly work with imx-pcm-dma-mx2 too. The patch moves the imx-pcm common bits from imx-ssi.c[h] into new files imx-pcm.c[h], and let imx-pcm-dma-mx2 and imx-pcm-fiq drivers build it in, so that imx-pcm-dma-mx2 can work with no dependency on imx-ssi driver. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/imx/Makefile')
-rw-r--r--sound/soc/imx/Makefile9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/imx/Makefile b/sound/soc/imx/Makefile
index 5c40541b8315..e9ed362636e8 100644
--- a/sound/soc/imx/Makefile
+++ b/sound/soc/imx/Makefile
@@ -1,14 +1,15 @@
# i.MX Platform Support
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-audmux-objs := imx-audmux.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_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
+
# i.MX Machine Support
snd-soc-eukrea-tlv320-objs := eukrea-tlv320.o
snd-soc-phycore-ac97-objs := phycore-ac97.o