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

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

ARM: OMAP: Remove CONFIG_OMAP_MCBSP references 



The McBSP driver stack has been moved to ASoC. The CONFIG_OMAP_MCBSP will
be removed since the CONFIG_SND_OMAP_SOC_MCBSP will trigger to build the
McBSP (audio) drivers.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
parent 94a504c2

arch/arm/mach-omap1/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ comment "OMAP Board Type" 
config MACH_OMAP_INNOVATOR

	bool "TI Innovator"

	depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)

	select OMAP_MCBSP

	help

          TI OMAP 1510 or 1610 Innovator board support. Say Y here if you

          have such a board.
@@ -45,7 +44,6 @@ config MACH_OMAP_INNOVATOR 
config MACH_OMAP_H2

	bool "TI H2 Support"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

	select OMAP_MCBSP

    	help

	  TI OMAP 1610/1611B H2 board support. Say Y here if you have such

	  a board.
@@ -72,7 +70,6 @@ config MACH_HERALD 
config MACH_OMAP_OSK

	bool "TI OSK Support"

	depends on ARCH_OMAP1 && ARCH_OMAP16XX

	select OMAP_MCBSP

    	help

	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here

          if you have such a board.

arch/arm/mach-omap1/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ 
obj-y := io.o id.o sram.o time.o irq.o mux.o flash.o serial.o devices.o dma.o

obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

obj-y += mcbsp.o

endif



obj-$(CONFIG_OMAP_32K_TIMER)	+= timer32k.o

arch/arm/mach-omap2/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -17,7 +17,9 @@ obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) 
obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)

obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)

obj-y += mcbsp.o

endif



obj-$(CONFIG_TWL4030_CORE) += omap_twl.o