From 246e7893095cc7642fb4a87c099924d5c3fafa98 Mon Sep 17 00:00:00 2001 From: Imre Deak Date: Thu, 3 Aug 2006 13:50:31 +0300 Subject: [PATCH] ARM: OMAP: make McBSP support a Kconfig option Signed-off-by: Imre Deak Signed-off-by: Juha Yrjola --- arch/arm/mach-omap1/Kconfig | 3 +++ arch/arm/plat-omap/Kconfig | 8 ++++++++ arch/arm/plat-omap/Makefile | 5 ++++- sound/arm/Kconfig | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig index e4b86c76e8e..781f0d4ea3e 100644 --- a/arch/arm/mach-omap1/Kconfig +++ b/arch/arm/mach-omap1/Kconfig @@ -22,6 +22,7 @@ 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. @@ -29,6 +30,7 @@ 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. @@ -44,6 +46,7 @@ config MACH_OMAP_H3 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/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index 8acdeb782e3..75f14947149 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig @@ -101,6 +101,14 @@ config OMAP_STI_CONSOLE help This enables a console driver by way of STI/XTI. +config OMAP_MCBSP + bool "McBSP support" + depends on ARCH_OMAP + default y + help + Say Y here if you want support for the OMAP Multichannel + Buffered Serial Port. + choice prompt "System timer" default OMAP_MPU_TIMER diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile index 34ba8fdd9cc..ec47e4873f8 100644 --- a/arch/arm/plat-omap/Makefile +++ b/arch/arm/plat-omap/Makefile @@ -3,7 +3,8 @@ # # Common support -obj-y := common.o sram.o sram-fn.o clock.o devices.o dma.o mux.o gpio.o mcbsp.o usb.o fb.o +obj-y := common.o sram.o sram-fn.o clock.o devices.o dma.o mux.o gpio.o \ + mcbsp.o usb.o fb.o obj-m := obj-n := obj- := @@ -16,6 +17,8 @@ obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o # STI support obj-$(CONFIG_OMAP_STI) += sti/ +obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o + obj-$(CONFIG_CPU_FREQ) += cpu-omap.o obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o obj-$(CONFIG_OMAP_BOOT_REASON) += bootreason.o diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig index fdf75e16cac..6d7b7e75182 100644 --- a/sound/arm/Kconfig +++ b/sound/arm/Kconfig @@ -39,6 +39,7 @@ config SND_OMAP_AIC23 select SND_PCM select I2C select I2C_OMAP if ARCH_OMAP + select OMAP_MCBSP select SENSORS_TLV320AIC23 help Say Y here if you have a OSK platform board @@ -53,6 +54,7 @@ config SND_OMAP_TSC2101 select SND_PCM select OMAP_TSC2101 select OMAP_UWIRE if ARCH_OMAP + select OMAP_MCBSP help Say Y here if you have a OMAP platform board and want to use its TSC2101 audio chip. Driver has -- 2.41.1