Merge branch 'gup_flag-cleanups'

[cascardo/linux.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 9bdd624..a13541b 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -186,7 +186,7 @@ config HISI_THERMAL
 
 config IMX_THERMAL
        tristate "Temperature sensor driver for Freescale i.MX SoCs"
-       depends on CPU_THERMAL
+       depends on (ARCH_MXC && CPU_THERMAL) || COMPILE_TEST
        depends on MFD_SYSCON
        depends on OF
        help
@@ -195,6 +195,26 @@ config IMX_THERMAL
          cpufreq is used as the cooling device to throttle CPUs when the
          passive trip is crossed.
 
+config MAX77620_THERMAL
+       tristate "Temperature sensor driver for Maxim MAX77620 PMIC"
+       depends on MFD_MAX77620
+       depends on OF
+       help
+         Support for die junction temperature warning alarm for Maxim
+         Semiconductor PMIC MAX77620 device. Device generates two alarm
+         interrupts when PMIC die temperature cross the threshold of
+         120 degC and 140 degC.
+
+config QORIQ_THERMAL
+       tristate "QorIQ Thermal Monitoring Unit"
+       depends on THERMAL_OF
+       depends on HAS_IOMEM
+       help
+         Support for Thermal Monitoring Unit (TMU) found on QorIQ platforms.
+         It supports one critical trip point and one passive trip point. The
+         cpufreq is used as the cooling device to throttle CPUs when the
+         passive trip is crossed.
+
 config SPEAR_THERMAL
        tristate "SPEAr thermal sensor driver"
        depends on PLAT_SPEAR || COMPILE_TEST
@@ -409,4 +429,9 @@ config GENERIC_ADC_THERMAL
          to this driver. This driver reports the temperature by reading ADC
          channel and converts it to temperature based on lookup table.
 
+menu "Qualcomm thermal drivers"
+depends on (ARCH_QCOM && OF) || COMPILE_TEST
+source "drivers/thermal/qcom/Kconfig"
+endmenu
+
 endif