diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:29:16 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2013-02-01 05:29:16 -0500 |
| commit | 0d0ffa94e0ea0aab3dcb75366806d064f05fdc45 (patch) | |
| tree | 43e74553fa29f2c303c3ba03395060aece1785d1 /arch/arm/Kconfig | |
| parent | 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (diff) | |
| parent | 2bdd424f26be1c98b6e3d9acfffb5559c131c888 (diff) | |
Merge branch 'for-rmk/virt/psci' into for-arm-soc/virt/mach
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9e8c0be7b5ca..c20441394504 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -1622,6 +1622,16 @@ config HOTPLUG_CPU | |||
| 1622 | Say Y here to experiment with turning CPUs off and on. CPUs | 1622 | Say Y here to experiment with turning CPUs off and on. CPUs |
| 1623 | can be controlled through /sys/devices/system/cpu. | 1623 | can be controlled through /sys/devices/system/cpu. |
| 1624 | 1624 | ||
| 1625 | config ARM_PSCI | ||
| 1626 | bool "Support for the ARM Power State Coordination Interface (PSCI)" | ||
| 1627 | depends on CPU_V7 | ||
| 1628 | help | ||
| 1629 | Say Y here if you want Linux to communicate with system firmware | ||
| 1630 | implementing the PSCI specification for CPU-centric power | ||
| 1631 | management operations described in ARM document number ARM DEN | ||
| 1632 | 0022A ("Power State Coordination Interface System Software on | ||
| 1633 | ARM processors"). | ||
| 1634 | |||
| 1625 | config LOCAL_TIMERS | 1635 | config LOCAL_TIMERS |
| 1626 | bool "Use local timer interrupts" | 1636 | bool "Use local timer interrupts" |
| 1627 | depends on SMP | 1637 | depends on SMP |