diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 20:43:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 20:43:53 -0400 |
commit | a5ebba6b54bc8038a38d3eacac3a79bbeaf3ee24 (patch) | |
tree | d36eb26a7efd4e00381bc9f6474ea3ec31340585 /arch/arm/plat-omap/Kconfig | |
parent | e81218f5f0fd219bd75768d845159ba4810bdd48 (diff) | |
parent | 6b21a9ce0402e0c5fd2adfa3d41328fdd8f55a9a (diff) |
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+
...
Diffstat (limited to 'arch/arm/plat-omap/Kconfig')
-rw-r--r-- | arch/arm/plat-omap/Kconfig | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig index dcfb506a592..dd36eba9506 100644 --- a/arch/arm/plat-omap/Kconfig +++ b/arch/arm/plat-omap/Kconfig | |||
@@ -45,31 +45,30 @@ config OMAP_DEBUG_LEDS | |||
45 | depends on OMAP_DEBUG_DEVICES | 45 | depends on OMAP_DEBUG_DEVICES |
46 | default y if LEDS_CLASS | 46 | default y if LEDS_CLASS |
47 | 47 | ||
48 | config OMAP_SMARTREFLEX | 48 | config POWER_AVS_OMAP |
49 | bool "SmartReflex support" | 49 | bool "AVS(Adaptive Voltage Scaling) support for OMAP IP versions 1&2" |
50 | depends on (ARCH_OMAP3 || ARCH_OMAP4) && PM | 50 | depends on POWER_AVS && (ARCH_OMAP3 || ARCH_OMAP4) && PM |
51 | help | 51 | help |
52 | Say Y if you want to enable SmartReflex. | 52 | Say Y to enable AVS(Adaptive Voltage Scaling) |
53 | 53 | support on OMAP containing the version 1 or | |
54 | SmartReflex can perform continuous dynamic voltage | 54 | version 2 of the SmartReflex IP. |
55 | scaling around the nominal operating point voltage | 55 | V1 is the 65nm version used in OMAP3430. |
56 | according to silicon characteristics and operating | 56 | V2 is the update for the 45nm version of the IP used in OMAP3630 |
57 | conditions. Enabling SmartReflex reduces power | 57 | and OMAP4430 |
58 | consumption. | ||
59 | 58 | ||
60 | Please note, that by default SmartReflex is only | 59 | Please note, that by default SmartReflex is only |
61 | initialized. To enable the automatic voltage | 60 | initialized and not enabled. To enable the automatic voltage |
62 | compensation for vdd mpu and vdd core from user space, | 61 | compensation for vdd mpu and vdd core from user space, |
63 | user must write 1 to | 62 | user must write 1 to |
64 | /debug/voltage/vdd_<X>/smartreflex/autocomp, | 63 | /debug/smartreflex/sr_<X>/autocomp, |
65 | where X is mpu or core for OMAP3. | 64 | where X is mpu_iva or core for OMAP3. |
66 | Optionally autocompensation can be enabled in the kernel | 65 | Optionally autocompensation can be enabled in the kernel |
67 | by default during system init via the enable_on_init flag | 66 | by default during system init via the enable_on_init flag |
68 | which an be passed as platform data to the smartreflex driver. | 67 | which an be passed as platform data to the smartreflex driver. |
69 | 68 | ||
70 | config OMAP_SMARTREFLEX_CLASS3 | 69 | config POWER_AVS_OMAP_CLASS3 |
71 | bool "Class 3 mode of Smartreflex Implementation" | 70 | bool "Class 3 mode of Smartreflex Implementation" |
72 | depends on OMAP_SMARTREFLEX && TWL4030_CORE | 71 | depends on POWER_AVS_OMAP && TWL4030_CORE |
73 | help | 72 | help |
74 | Say Y to enable Class 3 implementation of Smartreflex | 73 | Say Y to enable Class 3 implementation of Smartreflex |
75 | 74 | ||