Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (243 commits)
  omap2: Make OMAP2PLUS select OMAP_DM_TIMER
  OMAP4: hwmod data: Fix alignment and end of line in structurefields
  OMAP4: hwmod data: Move the DMA structures
  OMAP4: hwmod data: Move the smartreflex structures
  OMAP4: hwmod data: Fix missing SIDLE_SMART_WKUP in smartreflexsysc
  arm: omap: tusb6010: add name for MUSB IRQ
  arm: omap: craneboard: Add USB EHCI support
  omap2+: Initialize serial port for dynamic remuxing for n8x0
  omap2+: Add struct omap_board_data and use it for platform level serial init
  omap2+: Allow hwmod state changes to mux pads based on the state changes
  omap2+: Add support for hwmod specific muxing of devices
  omap2+: Add omap_mux_get_by_name
  OMAP2: PM: fix compile error when !CONFIG_SUSPEND
  MAINTAINERS: OMAP: hwmod: update hwmod code, data maintainership
  OMAP4: Smartreflex framework extensions
  OMAP4: hwmod: Add inital data for smartreflex modules.
  OMAP4: PM: Program correct init voltages for scalable VDDs
  OMAP4: Adding voltage driver support
  OMAP4: Register voltage PMIC parameters with the voltage layer
  OMAP3: PM: Program correct init voltages for VDD1 and VDD2
  ...

Fix up trivial conflict in arch/arm/plat-omap/Kconfig

1 files changed, 35 insertions, 0 deletions

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index c9408434a855..18fe3cb195dc 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -18,6 +18,7 @@ config ARCH_OMAP1
 config ARCH_OMAP2PLUS
         bool "TI OMAP2/3/4"
         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,6 +141,9 @@ config OMAP_IOMMU_DEBUG
 
          Say N unless you know you need this.
 
+config OMAP_IOMMU_IVA2
+        bool
+
 choice
         prompt "System timer"
         default OMAP_32K_TIMER if !ARCH_OMAP15XX