Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0f47ff1 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Liam Girdwood
Browse files

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarMark Brown <broonoie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
parent 3ead4679

sound/soc/omap/Kconfig

+0 −6
Original line number Original line Diff line number Diff line
@@ -5,13 +5,8 @@ config SND_OMAP_SOC 
config SND_OMAP_SOC_DMIC

config SND_OMAP_SOC_DMIC

	tristate

	tristate





config OMAP_MCBSP

	tristate

	depends on ARCH_OMAP



config SND_OMAP_SOC_MCBSP

config SND_OMAP_SOC_MCBSP

	tristate

	tristate

	select OMAP_MCBSP





config SND_OMAP_SOC_MCPDM

config SND_OMAP_SOC_MCPDM

	tristate

	tristate
@@ -31,7 +26,6 @@ config SND_OMAP_SOC_N810 
config SND_OMAP_SOC_RX51

config SND_OMAP_SOC_RX51

	tristate "SoC Audio support for Nokia RX-51"

	tristate "SoC Audio support for Nokia RX-51"

	depends on SND_OMAP_SOC && MACH_NOKIA_RX51

	depends on SND_OMAP_SOC && MACH_NOKIA_RX51

	select OMAP_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC3X

	select SND_SOC_TLV320AIC3X

	select SND_SOC_TPA6130A2

	select SND_SOC_TPA6130A2

sound/soc/omap/Makefile

+1 −2
Original line number Original line Diff line number Diff line 
# OMAP Platform Support

# OMAP Platform Support

snd-soc-omap-objs := omap-pcm.o

snd-soc-omap-objs := omap-pcm.o

snd-soc-omap-dmic-objs := omap-dmic.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-mcpdm-objs := omap-mcpdm.o

snd-soc-omap-hdmi-objs := omap-hdmi.o

snd-soc-omap-hdmi-objs := omap-hdmi.o





obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o

obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o

obj-$(CONFIG_SND_OMAP_SOC_DMIC) += snd-soc-omap-dmic.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_MCBSP) += snd-soc-omap-mcbsp.o

obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o

obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o

obj-$(CONFIG_SND_OMAP_SOC_HDMI) += snd-soc-omap-hdmi.o

obj-$(CONFIG_SND_OMAP_SOC_HDMI) += snd-soc-omap-hdmi.o