Merge branches 'misc', 'soc', 'soc-eduardo' and 'int3404-thermal' of .git into next

[firefly-linux-kernel-4.4.55.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index f35a1f75b15b87f2f37ea0bf671894acf549c207..35c066489a19ecd1def35f044e45dc52d55688a1 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -29,6 +29,19 @@ config THERMAL_HWMON
          Say 'Y' here if you want all thermal sensors to
          have hwmon sysfs interface too.
 
          Say 'Y' here if you want all thermal sensors to
          have hwmon sysfs interface too.
 

+config THERMAL_OF
+       bool
+       prompt "APIs to parse thermal data out of device tree"
+       depends on OF
+       default y
+       help
+         This options provides helpers to add the support to
+         read and parse thermal data definitions out of the
+         device tree blob.
+
+         Say 'Y' here if you need to build thermal infrastructure
+         based on device tree.
+

 choice
        prompt "Default Thermal governor"
        default THERMAL_DEFAULT_GOV_STEP_WISE
 choice
        prompt "Default Thermal governor"
        default THERMAL_DEFAULT_GOV_STEP_WISE


@@ -79,6 +92,7 @@ config THERMAL_GOV_USER_SPACE
 config CPU_THERMAL
        bool "generic cpu cooling support"
        depends on CPU_FREQ
 config CPU_THERMAL
        bool "generic cpu cooling support"
        depends on CPU_FREQ

+       depends on THERMAL_OF

        help
          This implements the generic cpu cooling mechanism through frequency
          reduction. An ACPI version of this already exists
        help
          This implements the generic cpu cooling mechanism through frequency
          reduction. An ACPI version of this already exists


@@ -121,7 +135,7 @@ config SPEAR_THERMAL
 
 config RCAR_THERMAL
        tristate "Renesas R-Car thermal driver"
 
 config RCAR_THERMAL
        tristate "Renesas R-Car thermal driver"

-       depends on ARCH_SHMOBILE
+       depends on ARCH_SHMOBILE || COMPILE_TEST

        help
          Enable this to plug the R-Car thermal sensor driver into the Linux
          thermal framework.
        help
          Enable this to plug the R-Car thermal sensor driver into the Linux
          thermal framework.


@@ -192,6 +206,13 @@ config X86_PKG_TEMP_THERMAL
          two trip points which can be set by user to get notifications via thermal
          notification methods.
 
          two trip points which can be set by user to get notifications via thermal
          notification methods.
 

+config ACPI_INT3403_THERMAL
+       tristate "ACPI INT3403 thermal driver"
+       depends on X86 && ACPI
+       help
+         This driver uses ACPI INT3403 device objects. If present, it will
+         register each INT3403 thermal sensor as a thermal zone.
+

 menu "Texas Instruments thermal drivers"
 source "drivers/thermal/ti-soc-thermal/Kconfig"
 endmenu
 menu "Texas Instruments thermal drivers"
 source "drivers/thermal/ti-soc-thermal/Kconfig"
 endmenu