Merge tag 'random-6.12-rc1-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index e14ae18a973b3c2024c6c1237b167cfbc1feeeca..65ea92529406d67d30de7c1d98d688189d35e9ba 100644 (file)
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -105,18 +105,6 @@ config SENSORS_AD7418
          This driver can also be built as a module. If so, the module
          will be called ad7418.
 
-config SENSORS_ADM1021
-       tristate "Analog Devices ADM1021 and compatibles"
-       depends on I2C
-       depends on SENSORS_LM90=n
-       help
-         If you say yes here you get support for Analog Devices ADM1021
-         and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
-         Genesys Logic GL523SM, National Semiconductor LM84 and TI THMC10.
-
-         This driver can also be built as a module. If so, the module
-         will be called adm1021.
-
 config SENSORS_ADM1025
        tristate "Analog Devices ADM1025 and compatibles"
        depends on I2C
@@ -506,6 +494,17 @@ config SENSORS_CORSAIR_PSU
          This driver can also be built as a module. If so, the module
          will be called corsair-psu.
 
+config SENSORS_CROS_EC
+       tristate "ChromeOS Embedded Controller sensors"
+       depends on MFD_CROS_EC_DEV
+       default MFD_CROS_EC_DEV
+       help
+         If you say yes here you get support for ChromeOS Embedded Controller
+         sensors.
+
+         This driver can also be built as a module. If so, the module
+         will be called cros_ec_hwmon.
+
 config SENSORS_DRIVETEMP
        tristate "Hard disk drives with temperature sensors"
        depends on SCSI && ATA
@@ -1241,18 +1240,6 @@ config SENSORS_MAX6639
          This driver can also be built as a module. If so, the module
          will be called max6639.
 
-config SENSORS_MAX6642
-       tristate "Maxim MAX6642 sensor chip"
-       depends on I2C
-       depends on SENSORS_LM90=n
-       help
-         If you say yes here you get support for MAX6642 sensor chip.
-         MAX6642 is a SMBus-Compatible Remote/Local Temperature Sensor
-         with Overtemperature Alarm from Maxim.
-
-         This driver can also be built as a module. If so, the module
-         will be called max6642.
-
 config SENSORS_MAX6650
        tristate "Maxim MAX6650 sensor chip"
        depends on I2C
@@ -1524,9 +1511,10 @@ config SENSORS_LM90
 config SENSORS_LM92
        tristate "National Semiconductor LM92 and compatibles"
        depends on I2C
+       select REGMAP_I2C
        help
          If you say yes here you get support for National Semiconductor LM92
-         and Maxim MAX6635 sensor chips.
+         and LM76 as well as Maxim MAX6633/6634/6635 sensor chips.
 
          This driver can also be built as a module. If so, the module
          will be called lm92.
@@ -1545,6 +1533,7 @@ config SENSORS_LM93
 config SENSORS_LM95234
        tristate "National Semiconductor LM95234 and compatibles"
        depends on I2C
+       select REGMAP_I2C
        help
          If you say yes here you get support for the LM95233 and LM95234
          temperature sensor chips.
@@ -2079,6 +2068,17 @@ config SENSORS_SFCTEMP
          This driver can also be built as a module.  If so, the module
          will be called sfctemp.
 
+config SENSORS_SG2042_MCU
+       tristate "Sophgo onboard MCU support"
+       depends on I2C
+       depends on ARCH_SOPHGO || COMPILE_TEST
+       help
+         Support for onboard MCU of Sophgo SG2042 SoCs. This mcu provides
+         power control and some basic information.
+
+         This driver can be built as a module. If so, the module
+         will be called sg2042-mcu.
+
 config SENSORS_SURFACE_FAN
        tristate "Surface Fan Driver"
        depends on SURFACE_AGGREGATOR
@@ -2093,6 +2093,17 @@ config SENSORS_SURFACE_FAN
 
          Select M or Y here, if you want to be able to read the fan's speed.
 
+config SENSORS_SURFACE_TEMP
+       tristate "Microsoft Surface Thermal Sensor Driver"
+       depends on SURFACE_AGGREGATOR
+       depends on SURFACE_AGGREGATOR_BUS
+       help
+         Driver for monitoring thermal sensors connected via the Surface
+         Aggregator Module (embedded controller) on Microsoft Surface devices.
+
+         This driver can also be built as a module. If so, the module
+         will be called surface_temp.
+
 config SENSORS_ADC128D818
        tristate "Texas Instruments ADC128D818"
        depends on I2C
@@ -2127,6 +2138,7 @@ config SENSORS_ADS7871
 config SENSORS_AMC6821
        tristate "Texas Instruments AMC6821"
        depends on I2C
+       select REGMAP_I2C
        help
          If you say yes here you get support for the Texas Instruments
          AMC6821 hardware monitoring chips.
@@ -2181,6 +2193,37 @@ config SENSORS_INA3221
          This driver can also be built as a module. If so, the module
          will be called ina3221.
 
+config SENSORS_SPD5118
+       tristate "SPD5118 Compliant Temperature Sensors"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         If you say yes here you get support for SPD5118 (JEDEC JESD300)
+         compliant temperature sensors. Such sensors are found on DDR5 memory
+         modules.
+
+         This driver can also be built as a module. If so, the module
+         will be called spd5118.
+
+config SENSORS_SPD5118_DETECT
+       bool "Enable detect function"
+       depends on SENSORS_SPD5118
+       default (!DMI || !X86)
+       help
+         If enabled, the driver auto-detects if a chip in the SPD address
+         range is compliant to the SPD51888 standard and auto-instantiates
+         if that is the case. If disabled, SPD5118 compliant devices have
+         to be instantiated by other means. On X86 systems with DMI support
+         this will typically be done from DMI DDR detection code in the
+         I2C SMBus subsystem. Devicetree based systems will instantiate
+         attached devices if the DIMMs are listed in the devicetree file.
+
+         Disabling the detect function will speed up boot time and reduce
+         the risk of mis-detecting SPD5118 compliant devices. However, it
+         may result in missed DIMMs under some circumstances.
+
+         If unsure, say Y.
+
 config SENSORS_TC74
        tristate "Microchip TC74"
        depends on I2C