[alsa-devel] [PATCH 0/2] ARM/ASoC: OMAP: McBSP config cleanup
Hi,
Since the McBSP driver has been moved out from arch/arm/plat-omap/ and it is combined as a single driver with the sound/soc/omap/omap-mcbsp.c there is no longer need to have CONFIG_OMAP_MCBSP. This series cleans up the Kconfigs, and Makefiles. Also it is fixes the issue that the OMAP audio drivers were not buildable as modules (the ones using McBSP) reported by Grazvydas Ignotas notasas@gmail.com
I have generated this series on top of Liam's for-3.4 branch. The arch/arm/mach-omap* patch applies cleanly on top of todays linux-next, so if this series goes via ASoC we are not going to have conflicts with stuff coming via l-o.
Tested on BeagleBoard, and SDP4430, compile tested for OMAP1.
This series should go via ASoC along with the rest of the McBSP changes.
Regards, Peter --- Peter Ujfalusi (2): ARM: OMAP: Remove CONFIG_OMAP_MCBSP references ASoC: OMAP: Build config cleanup for McBSP
arch/arm/mach-omap1/Kconfig | 3 --- arch/arm/mach-omap1/Makefile | 4 +++- arch/arm/mach-omap2/Makefile | 4 +++- sound/soc/omap/Kconfig | 6 ------ sound/soc/omap/Makefile | 3 +-- 5 files changed, 7 insertions(+), 13 deletions(-)
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: Peter Ujfalusi peter.ujfalusi@ti.com --- arch/arm/mach-omap1/Kconfig | 3 --- arch/arm/mach-omap1/Makefile | 4 +++- arch/arm/mach-omap2/Makefile | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index 4f8d66f..922ab0d 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -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. diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile index 11c85cd..9923f92 100644 --- a/arch/arm/mach-omap1/Makefile +++ b/arch/arm/mach-omap1/Makefile @@ -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
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index bd76394..06326a6 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -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
* Peter Ujfalusi peter.ujfalusi@ti.com [120309 00:54]:
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.
Great, glad to see this! Thanks for working on this:
Acked-by: Tony Lindgren tony@atomide.com
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 peter.ujfalusi@ti.com --- sound/soc/omap/Kconfig | 6 ------ sound/soc/omap/Makefile | 3 +-- 2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 4bb7802..deafbfa 100644 --- 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 9f8fbd5..1d656bc 100644 --- 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
On Fri, Mar 09, 2012 at 10:51:18AM +0200, Peter Ujfalusi wrote:
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.
Acked-by: Mark Brown broonie@opensource.wolfsonmicro.com
participants (3)
-
Mark Brown -
Peter Ujfalusi -
Tony Lindgren