Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull arm-soc power management changes from Arnd Bergmann:
 "These are various power management related changes, mainly concerning
  cpuidle on i.MX and OMAP, as well as a the move of the omap
  smartreflex driver to live in the power subsystem."

Fix up conflicts in arch/arm/mach-{imx/mach-imx6q.c,omap2/prm2xxx_3xxx.h}

* tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
  ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
  ARM: OMAP2+: do not allow SmartReflex to be built as a module
  ARM: OMAP2: Use hwmod to initialize mmc for 2420
  ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
  ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
  ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
  ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
  ARM: OMAP3: PM: call pre/post transition per powerdomain
  ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
  ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
  ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
  ARM: OMAP3+: PRM: Enable IO wake up
  ARM: OMAP4: PRM: Add IO Daisychain support
  ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
  ARM: OMAP3: PM: correct enable/disable of daisy io chain
  ARM: OMAP2+: PRM: fix compile for OMAP4-only build
  W1: OMAP HDQ1W: use runtime PM
  ARM: OMAP2+: HDQ1W: use omap_device
  W1: OMAP HDQ1W: use 32-bit register accesses
  W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
  ...

1 files changed, 15 insertions, 16 deletions

diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index dcfb506a592e..dd36eba9506c 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -45,31 +45,30 @@ 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
+config POWER_AVS_OMAP
+        bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2"
+        depends on POWER_AVS && (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.
+          Say Y to enable AVS(Adaptive Voltage Scaling)
+          support on OMAP containing the version 1 or
+          version 2 of the SmartReflex IP.
+          V1 is the 65nm version used in OMAP3430.
+          V2 is the update for the 45nm version of the IP used in OMAP3630
+          and OMAP4430
 
           Please note, that by default SmartReflex is only
-          initialized. To enable the automatic voltage
-          compensation for vdd mpu  and vdd core from user space,
+          initialized and not enabled. 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.
+                /debug/smartreflex/sr_<X>/autocomp,
+          where X is mpu_iva or core for OMAP3.
           Optionally 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
+config POWER_AVS_OMAP_CLASS3
         bool "Class 3 mode of Smartreflex Implementation"
-        depends on OMAP_SMARTREFLEX && TWL4030_CORE
+        depends on POWER_AVS_OMAP && TWL4030_CORE
         help
           Say Y to enable Class 3 implementation of Smartreflex