Merge branch 'thermal-soc' into next

[sfrench/cifs-2.6.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 74ef51dfb816bce97d9367d49eed0f7201a882d2..4edc011fe4a5fe45718c033b051ef262c6db6c9a 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -320,6 +320,16 @@ config DB8500_CPUFREQ_COOLING
          bound cpufreq cooling device turns active to set CPU frequency low to
          cool down the CPU.
 
+config DA9062_THERMAL
+       tristate "DA9062/DA9061 Dialog Semiconductor thermal driver"
+       depends on MFD_DA9062 || COMPILE_TEST
+       depends on OF
+       help
+         Enable this for the Dialog Semiconductor thermal sensor driver.
+         This will report PMIC junction over-temperature for one thermal trip
+         zone.
+         Compatible with the DA9062 and DA9061 PMICs.
+
 config INTEL_POWERCLAMP
        tristate "Intel PowerClamp idle injection driver"
        depends on THERMAL
@@ -409,6 +419,11 @@ config MTK_THERMAL
          Enable this option if you want to have support for thermal management
          controller present in Mediatek SoCs
 
+menu "Broadcom thermal drivers"
+depends on ARCH_BCM || COMPILE_TEST
+source "drivers/thermal/broadcom/Kconfig"
+endmenu
+
 menu "Texas Instruments thermal drivers"
 depends on ARCH_HAS_BANDGAP || COMPILE_TEST
 depends on HAS_IOMEM