Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / plat-omap / Kconfig

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 92c5bb7909f5632c6d0132813292e655a1d16161..b6333ae3f92aa22f8820720d5cf147089ce62efc 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -11,13 +11,14 @@ choice
 
 config ARCH_OMAP1
        bool "TI OMAP1"
-       select COMMON_CLKDEV
+       select CLKDEV_LOOKUP
        help
          "Systems based on omap7xx, omap15xx or omap16xx"
 
 config ARCH_OMAP2PLUS
        bool "TI OMAP2/3/4"
-       select COMMON_CLKDEV
+       select CLKDEV_LOOKUP
+       select OMAP_DM_TIMER
        help
          "Systems based on OMAP2, OMAP3 or OMAP4"
 
@@ -35,6 +36,37 @@ config OMAP_DEBUG_LEDS
        depends on OMAP_DEBUG_DEVICES
        default y if LEDS_CLASS
 
+config OMAP_SMARTREFLEX
+       bool "SmartReflex support"
+       depends on (ARCH_OMAP3 || ARCH_OMAP4) && PM
+       help
+         Say Y if you want to enable SmartReflex.
+
+         SmartReflex can perform continuous dynamic voltage
+         scaling around the nominal operating point voltage
+         according to silicon characteristics and operating
+         conditions. Enabling SmartReflex reduces power
+         consumption.
+
+         Please note, that by default SmartReflex is only
+         initialized. To enable the automatic voltage
+         compensation for vdd mpu  and vdd core from user space,
+         user must write 1 to
+               /debug/voltage/vdd_<X>/smartreflex/autocomp,
+         where X is mpu or core for OMAP3.
+         Optionallly autocompensation can be enabled in the kernel
+         by default during system init via the enable_on_init flag
+         which an be passed as platform data to the smartreflex driver.
+
+config OMAP_SMARTREFLEX_CLASS3
+       bool "Class 3 mode of Smartreflex Implementation"
+       depends on OMAP_SMARTREFLEX && TWL4030_CORE
+       help
+         Say Y to enable Class 3 implementation of Smartreflex
+
+         Class 3 implementation of Smartreflex employs continuous hardware
+         voltage calibration.
+
 config OMAP_RESET_CLOCKS
        bool "Reset unused clocks during boot"
        depends on ARCH_OMAP
@@ -109,12 +141,12 @@ config OMAP_IOMMU_DEBUG
 
          Say N unless you know you need this.
 
-choice
-       prompt "System timer"
-       default OMAP_32K_TIMER if !ARCH_OMAP15XX
+config OMAP_IOMMU_IVA2
+       bool
 
 config OMAP_MPU_TIMER
        bool "Use mpu timer"
+       depends on ARCH_OMAP1
        help
          Select this option if you want to use the OMAP mpu timer. This
          timer provides more intra-tick resolution than the 32KHz timer,
@@ -123,6 +155,7 @@ config OMAP_MPU_TIMER
 config OMAP_32K_TIMER
        bool "Use 32KHz timer"
        depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS
+       default y if (ARCH_OMAP16XX || ARCH_OMAP2PLUS)
        help
          Select this option if you want to enable the OMAP 32KHz timer.
          This timer saves power compared to the OMAP_MPU_TIMER, and has
@@ -130,8 +163,6 @@ config OMAP_32K_TIMER
          intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is
          currently only available for OMAP16XX, 24XX, 34XX and OMAP4.
 
-endchoice
-
 config OMAP3_L2_AUX_SECURE_SAVE_RESTORE
        bool "OMAP3 HS/EMU save and restore for L2 AUX control register"
        depends on ARCH_OMAP3 && PM