ASoC: OMAP: Build config cleanup for McBSP

The McBSP driver stack has been moved, and rewritten resulting a single
driver - selected by CONFIG_SND_OMAP_SOC_MCBSP. There is no longer need to
have CONFIG_OMAP_MCBSP anymore.

Signed-off-by: Peter Ujfalusi <[email protected]>
Acked-by: Mark Brown <[email protected]>
Signed-off-by: Liam Girdwood <[email protected]>

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 27a3a29f7cd3c64156d6ff7fdfdeba0e60c09fcf..e00dd0b1139ca17144048a41148fb2a656b2db7c 100644 (file)
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -5,13 +5,8 @@ config SND_OMAP_SOC
 config SND_OMAP_SOC_DMIC
        tristate
 
-config OMAP_MCBSP
-       tristate
-       depends on ARCH_OMAP
-
 config SND_OMAP_SOC_MCBSP
        tristate
-       select OMAP_MCBSP
 
 config SND_OMAP_SOC_MCPDM
        tristate
@@ -31,7 +26,6 @@ config SND_OMAP_SOC_N810
 config SND_OMAP_SOC_RX51
        tristate "SoC Audio support for Nokia RX-51"
        depends on SND_OMAP_SOC && MACH_NOKIA_RX51
-       select OMAP_MCBSP
        select SND_OMAP_SOC_MCBSP
        select SND_SOC_TLV320AIC3X
        select SND_SOC_TPA6130A2

diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index 9f8fbd554eb6b8dda616d7f6b50b5bf3089f89a1..1d656bce01d48e599f18e7a1ec74f91cd1fcb573 100644 (file)
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -1,13 +1,12 @@
 # OMAP Platform Support
 snd-soc-omap-objs := omap-pcm.o
 snd-soc-omap-dmic-objs := omap-dmic.o
-snd-soc-omap-mcbsp-objs := omap-mcbsp.o
+snd-soc-omap-mcbsp-objs := omap-mcbsp.o mcbsp.o
 snd-soc-omap-mcpdm-objs := omap-mcpdm.o
 snd-soc-omap-hdmi-objs := omap-hdmi.o
 
 obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o
 obj-$(CONFIG_SND_OMAP_SOC_DMIC) += snd-soc-omap-dmic.o
-obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
 obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o
 obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o
 obj-$(CONFIG_SND_OMAP_SOC_HDMI) += snd-soc-omap-hdmi.o