REMOVE OMAP LEGACY CODE: Reset clocks and PM code to mainline

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / Kconfig

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 960c13fd3b33d2d4b94b0ac19a83a9609a8ac7ad..b37fc101e9f581bed9ea5feff8b1e4dd0009e76a 100644 (file)
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -11,12 +11,17 @@ choice
 
 config ARCH_OMAP1
        bool "TI OMAP1"
+       select COMMON_CLKDEV
 
 config ARCH_OMAP2
        bool "TI OMAP2"
+       select CPU_V6
+       select COMMON_CLKDEV
 
 config ARCH_OMAP3
        bool "TI OMAP3"
+       select CPU_V7
+       select COMMON_CLKDEV
 
 endchoice
 
@@ -56,37 +61,6 @@ config OMAP_DEBUG_CLOCKDOMAIN
          for every clockdomain register write.  However, the
          extra detail costs some memory.
 
-config OMAP_SMARTREFLEX
-       bool "SmartReflex support"
-       depends on ARCH_OMAP34XX && TWL4030_CORE
-       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 VDD1 and VDD2, user must write 1 to
-         /sys/power/sr_vddX_autocomp, where X is 1 or 2.
-
-config OMAP_SMARTREFLEX_TESTING
-       bool "Smartreflex testing support"
-       depends on OMAP_SMARTREFLEX
-       default n
-       help
-         Say Y if you want to enable SmartReflex testing with SW hardcoded
-         NVALUES intead of E-fuse NVALUES set in factory silicon testing.
-
-         In some devices the E-fuse values have not been set, even though
-         SmartReflex modules are included. Using these hardcoded values set
-         in software, one can test the SmartReflex features without E-fuse.
-
-         WARNING: Enabling this option may cause your device to hang!
-
 config OMAP_RESET_CLOCKS
        bool "Reset unused clocks during boot"
        depends on ARCH_OMAP
@@ -166,21 +140,13 @@ config OMAP_MCBSP
          Say Y here if you want support for the OMAP Multichannel
          Buffered Serial Port.
 
-config OMAP_MMU_FWK
-       bool "MMU framework support"
-       depends on ARCH_OMAP
-       default n
-       help
-         Say Y here if you want to use OMAP MMU framework support for
-         DSP, IVA1.0 and Camera in OMAP1/2.
-
 config OMAP_MBOX_FWK
        tristate "Mailbox framework support"
        depends on ARCH_OMAP
        default n
        help
          Say Y here if you want to use OMAP Mailbox framework support for
-         DSP and IVA1.0 in OMAP1/2.
+         DSP, IVA1.0 and IVA2 in OMAP1/2/3.
 
 choice
         prompt "System timer"