Merge branch 'next/drivers' into HEAD

[karo-tx-linux.git] / arch / arm / mach-omap2 / Kconfig

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 728b05eb2964933ee52a9a09c23d679b8c98a42a..a6219eaf1f68116dffb16a2f1b1645e4602d8007 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -18,12 +18,16 @@ config ARCH_OMAP2PLUS_TYPICAL
        select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
        select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
        select HIGHMEM
+       select PINCTRL
        help
          Compile a kernel suitable for booting most boards
 
 config SOC_HAS_OMAP2_SDRC
        bool "OMAP2 SDRAM Controller support"
 
+config SOC_HAS_REALTIME_COUNTER
+       bool "Real time free running counter"
+
 config ARCH_OMAP2
        bool "TI OMAP2"
        depends on ARCH_OMAP2PLUS
@@ -72,6 +76,8 @@ config SOC_OMAP5
        select ARM_GIC
        select HAVE_SMP
        select ARM_CPU_SUSPEND if PM
+       select SOC_HAS_REALTIME_COUNTER
+       select ARM_ARCH_TIMER
 
 comment "OMAP Core Type"
        depends on ARCH_OMAP2
@@ -234,10 +240,11 @@ config MACH_OMAP3_PANDORA
        select OMAP_PACKAGE_CBB
        select REGULATOR_FIXED_VOLTAGE if REGULATOR
 
-config MACH_OMAP3_TOUCHBOOK
+config MACH_TOUCHBOOK
        bool "OMAP3 Touch Book"
        depends on ARCH_OMAP3
        default y
+       select OMAP_PACKAGE_CBB
 
 config MACH_OMAP_3430SDP
        bool "OMAP 3430 SDP board"