Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / drivers / thermal / Kconfig

diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index b5b5facb87473e4de8c30fa29a105251965cd027..07002df4f83acdde2efdf3f51299976ef25d2e1e 100644 (file)
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -342,7 +342,7 @@ config X86_PKG_TEMP_THERMAL
 
 config INTEL_SOC_DTS_IOSF_CORE
        tristate
-       depends on X86
+       depends on X86 && PCI
        select IOSF_MBI
        help
          This is becoming a common feature for Intel SoCs to expose the additional
@@ -352,7 +352,7 @@ config INTEL_SOC_DTS_IOSF_CORE
 
 config INTEL_SOC_DTS_THERMAL
        tristate "Intel SoCs DTS thermal driver"
-       depends on X86
+       depends on X86 && PCI
        select INTEL_SOC_DTS_IOSF_CORE
        select THERMAL_WRITABLE_TRIPS
        help
@@ -473,4 +473,12 @@ config ZX2967_THERMAL
          the primitive temperature sensor embedded in zx2967 SoCs.
          This sensor generates the real time die temperature.
 
+config UNIPHIER_THERMAL
+       tristate "Socionext UniPhier thermal driver"
+       depends on ARCH_UNIPHIER || COMPILE_TEST
+       depends on THERMAL_OF && MFD_SYSCON
+       help
+         Enable this to plug in UniPhier on-chip PVT thermal driver into the
+         thermal framework. The driver supports CPU thermal zone temperature
+         reporting and a couple of trip points.
 endif