Merge tag 'hwmon-for-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...

[linux-block.git] / drivers / hwmon / Kconfig

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 497cbfb460e5df928e74681bd0c05cfeca34cdb1..0c4cdb21ae1384e6cbcb11fbf1bb879bc0f5671f 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -714,6 +714,15 @@ config SENSORS_GPIO_FAN
          This driver can also be built as a module. If so, the module
          will be called gpio-fan.
 
+config SENSORS_GXP_FAN_CTRL
+       tristate "HPE GXP fan controller"
+       depends on ARCH_HPE_GXP || COMPILE_TEST
+       help
+         If you say yes here you get support for GXP fan control functionality.
+
+         The GXP controls fan function via the CPLD through the use of PWM
+         registers. This driver reports status and pwm setting of the fans.
+
 config SENSORS_HIH6130
        tristate "Honeywell Humidicon HIH-6130 humidity/temperature sensor"
        depends on I2C
@@ -1166,6 +1175,13 @@ config SENSORS_MAX31790
          This driver can also be built as a module. If so, the module
          will be called max31790.
 
+config SENSORS_MC34VR500
+       tristate "NXP MC34VR500 hardware monitoring driver"
+       depends on I2C
+       help
+         If you say yes here you get support for the temperature and input
+         voltage sensors of the NXP MC34VR500.
+
 config SENSORS_MCP3021
        tristate "Microchip MCP3021 and compatibles"
        depends on I2C
@@ -1516,7 +1532,7 @@ config SENSORS_NCT6775_CORE
 config SENSORS_NCT6775
        tristate "Platform driver for Nuvoton NCT6775F and compatibles"
        depends on !PPC
-       depends on ACPI_WMI || ACPI_WMI=n
+       depends on ACPI || ACPI=n
        select HWMON_VID
        select SENSORS_NCT6775_CORE
        help