Merge tag 'dmaengine-fix-5.6-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[linux.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 79b27865c6f42c7342274904db052c138fa2e61f..5a05db5438d601be74cecd047c79fdda1d6ce633 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -151,8 +151,18 @@ config THERMAL_GOV_POWER_ALLOCATOR
 
 config CPU_THERMAL
        bool "Generic cpu cooling support"
-       depends on CPU_FREQ
        depends on THERMAL_OF
+       help
+         Enable the CPU cooling features. If the system has no active
+         cooling device available, this option allows to use the CPU
+         as a cooling device.
+
+if CPU_THERMAL
+
+config CPU_FREQ_THERMAL
+       bool "CPU frequency cooling device"
+       depends on CPU_FREQ
+       default y
        help
          This implements the generic cpu cooling mechanism through frequency
          reduction. An ACPI version of this already exists
@@ -160,7 +170,14 @@ config CPU_THERMAL
          This will be useful for platforms using the generic thermal interface
          and not the ACPI interface.
 
-         If you want this support, you should say Y here.
+config CPU_IDLE_THERMAL
+       bool "CPU idle cooling device"
+       depends on IDLE_INJECT
+       help
+         This implements the CPU cooling mechanism through
+         idle injection. This will throttle the CPU by injecting
+         idle cycle.
+endif
 
 config CLOCK_THERMAL
        bool "Generic clock cooling support"
@@ -263,6 +280,20 @@ config SPEAR_THERMAL
          Enable this to plug the SPEAr thermal sensor driver into the Linux
          thermal framework.
 
+config SUN8I_THERMAL
+       tristate "Allwinner sun8i thermal driver"
+       depends on ARCH_SUNXI || COMPILE_TEST
+       depends on HAS_IOMEM
+       depends on NVMEM
+       depends on OF
+       depends on RESET_CONTROLLER
+       help
+         Support for the sun8i thermal sensor driver into the Linux thermal
+         framework.
+
+         To compile this driver as a module, choose M here: the
+         module will be called sun8i-thermal.
+
 config ROCKCHIP_THERMAL
        tristate "Rockchip thermal driver"
        depends on ARCH_ROCKCHIP || COMPILE_TEST