diff options
author | Kevin Hilman <khilman@linaro.org> | 2015-07-07 09:25:51 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2015-07-07 09:25:51 -0700 |
commit | 5a277b6839c4ef6c6ccacff49b64f302598264bf (patch) | |
tree | 728480e15da56231d621cd83ae4effbdbcb58fab /drivers/thermal/Kconfig | |
parent | 630835f74b883ccf1c4c674edd40ed050b6d30e3 (diff) | |
parent | 18837407265a12d6dc0f2338f8a6b5f3f35fb0c4 (diff) |
Merge branch 'v4.1/topic/thermal' into linux-linaro-lsk-v4.1
* v4.1/topic/thermal:
thermal: of-thermal: add support for reading coefficients property
thermal: support slope and offset coefficients
thermal: power_allocator: round the division when divvying up power
thermal: cpu_cooling: Fix power calculation when CPUs are offline
thermal: cpu_cooling: Remove cpu_dev update on policy CPU update
thermal: Default OF created trip points to writable
thermal: export thermal_zone_parameters to sysfs
thermal: core: Add Kconfig option to enable writable trips
of: thermal: Introduce sustainable power for a thermal zone
thermal: add trace events to the power allocator governor
thermal: introduce the Power Allocator governor
thermal: cpu_cooling: implement the power cooling device API
thermal: extend the cooling device API to include power information
thermal: let governors have private data for each thermal zone
thermal: fair_share: generalize the weight concept
thermal: export weight to sysfs
thermal: fair_share: use the weight from the thermal instance
thermal: of: fix cooling device weights in device tree
Diffstat (limited to 'drivers/thermal/Kconfig')
-rw-r--r-- | drivers/thermal/Kconfig | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index af40db0df58e..2acc88378099 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -42,6 +42,17 @@ config THERMAL_OF Say 'Y' here if you need to build thermal infrastructure based on device tree. +config THERMAL_WRITABLE_TRIPS + bool "Enable writable trip points" + help + This option allows the system integrator to choose whether + trip temperatures can be changed from userspace. The + writable trips need to be specified when setting up the + thermal zone but the choice here takes precedence. + + Say 'Y' here if you would like to allow userspace tools to + change trip temperatures. + choice prompt "Default Thermal governor" default THERMAL_DEFAULT_GOV_STEP_WISE @@ -71,6 +82,14 @@ config THERMAL_DEFAULT_GOV_USER_SPACE Select this if you want to let the user space manage the platform thermals. +config THERMAL_DEFAULT_GOV_POWER_ALLOCATOR + bool "power_allocator" + select THERMAL_GOV_POWER_ALLOCATOR + help + Select this if you want to control temperature based on + system and device power allocation. This governor can only + operate on cooling devices that implement the power API. + endchoice config THERMAL_GOV_FAIR_SHARE @@ -99,6 +118,13 @@ config THERMAL_GOV_USER_SPACE help Enable this to let the user space manage the platform thermals. +config THERMAL_GOV_POWER_ALLOCATOR + bool "Power allocator thermal governor" + select THERMAL_POWER_ACTOR + help + Enable this to manage platform thermals by dynamically + allocating and limiting power to devices. + config CPU_THERMAL bool "generic cpu cooling support" depends on CPU_FREQ |