ASoC: Ux500: Move i2s into ASoC and remove old i2s-layer

The old multi-client i2s driver-layer located in drivers/misc/i2s
is removed and the MSP-operation for i2s is moved into the file
ux500_msp_i2s.c in the Ux500 ASoC-folder.

ST-Ericsson ID: -
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial

Change-Id: I11c9021bb7b2385afba9a3e658b5bef7fe9fdb68
Signed-off-by: Ola Lilja <ola.o.lilja@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/41704

1 files changed, 17 insertions, 18 deletions

diff --git a/sound/soc/ux500/Makefile b/sound/soc/ux500/Makefile
index 255c0ecefdb..262e44a2812 100644
--- a/sound/soc/ux500/Makefile
+++ b/sound/soc/ux500/Makefile
@@ -1,47 +1,46 @@
 # Ux500 Platform Support
 
 ifdef CONFIG_SND_SOC_UX500_DEBUG
+CFLAGS_u8500.o := -DDEBUG
 CFLAGS_ux500_pcm.o := -DDEBUG
 CFLAGS_ux500_msp_dai.o := -DDEBUG
 CFLAGS_ux500_ab3550.o := -DDEBUG
 CFLAGS_ux500_ab8500.o := -DDEBUG
 CFLAGS_ux500_av8100.o := -DDEBUG
 CFLAGS_ux500_cg29xx.o := -DDEBUG
+CFLAGS_ux500_msp_i2s.o := -DDEBUG
 endif
 
-ifdef CONFIG_SND_SOC_UX500_AB3550
-snd-soc-ux500-ab3550-objs := ux500_ab3550.o
-obj-$(CONFIG_SND_SOC_UX500_AB3550) += ux500_ab3550.o
-endif
-
-ifdef CONFIG_SND_SOC_UX500_AB5500
-snd-soc-ux500-ab5500-objs := ux500_ab5500.o
-obj-$(CONFIG_SND_SOC_UX500_AB5500) += ux500_ab5500.o
+ifdef CONFIG_UX500_SOC_DBX500
+snd-soc-ux500-platform-objs := ux500_pcm.o ux500_msp_dai.o ux500_msp_i2s.o
+obj-y += snd-soc-ux500-platform.o
 endif
 
 ifdef CONFIG_SND_SOC_UX500_AB8500
-snd-soc-ux500-ab8500-objs := ux500_ab8500.o
-obj-$(CONFIG_SND_SOC_UX500_AB8500) += ux500_ab8500.o
+snd-soc-ux500-machine-objs += ux500_ab8500.o
 endif
 
 ifdef CONFIG_SND_SOC_UX500_AV8100
-snd-soc-ux500-av8100-objs := ux500_av8100.o
-obj-$(CONFIG_SND_SOC_UX500_AV8100) += ux500_av8100.o
+snd-soc-ux500-machine-objs += ux500_av8100.o
 endif
 
 ifdef CONFIG_SND_SOC_UX500_CG29XX
-snd-soc-ux500-cg29xx-objs := ux500_cg29xx.o
-obj-$(CONFIG_SND_SOC_UX500_CG29XX) += ux500_cg29xx.o
+snd-soc-ux500-machine-objs += ux500_cg29xx.o
+endif
+
+ifdef CONFIG_SND_SOC_UX500_AB5500
+snd-soc-ux500-machine-objs += ux500_ab5500.o
 endif
 
-snd-soc-ux500-objs := ux500_pcm.o ux500_msp_dai.o
+obj-y += snd-soc-ux500-machine.o
 
 ifdef CONFIG_UX500_SOC_DB8500
-snd-soc-ux500-objs += u8500.o
+snd-soc-u8500-objs := u8500.o
+obj-y += snd-soc-u8500.o
 endif
 
 ifdef CONFIG_UX500_SOC_DB5500
-snd-soc-ux500-objs += u5500.o
+snd-soc-u5500-objs := u5500.o
+obj-y += snd-soc-u5500.o
 endif
 
-obj-$(CONFIG_UX500_SOC_DBX500) += snd-soc-ux500.o