diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:00:03 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 09:00:03 -0800 |
commit | a26a9d8ab4f9edbdfb087a563b6613e9970ef0b0 (patch) | |
tree | a28248f140839b9801cc9902a06e3b4b5aa0914c /drivers/hwmon/Kconfig | |
parent | 983e4adae0cfa4d3dfdf73b79aabc450dda8ce0e (diff) | |
parent | 6ab3332cc692ad04dfa30c92d3391aea8b971ef2 (diff) |
Merge tag 'hwmon-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"New drivers:
- Texas Instruments TPS23861 driver
- AHT10 Temperature and Humidity Sensor Driver
Support for new chips/variants to existing drivers:
- Add AMD family 19h model 30h x86 match to amd_energy driver
- Add Zen3 Ryzen Desktop CPUs support to k10temp driver
- Add support for MAX16508 to max16601 driver
- Support revision "B" of max31785
- Add support for ASRock boards to nct6683 driver
Driver removals:
- Decomission abx500 driver
Various other minor fixes and improvements"
* tag 'hwmon-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (30 commits)
MAINTAINERS: Add entry for Texas Instruments TPS23861 PoE PSE
hwmon: add Texas Instruments TPS23861 driver
dt-bindings: hwmon: Add TI TPS23861 bindings
hwmon: (da9052) Switch to using the new API kobj_to_dev()
hwmon: (amd_energy) Add AMD family 19h model 30h x86 match
hwmon: (pmbus/max31785) Support revision "B"
hwmon: (pmbus/lm25066) Remove unnecessary pmbus_clear_cache function call
hwmon: (pmbus) Clear sensor data after chip write
hwmon: (pmbus/max16601) Add support for MAX16508
hwmon: (pmbus/max16601) Determine and use number of populated phases
hwmon: (pmbus) Simplify the calculation of variables
hwmon: (aht10) Unlock on error in aht10_read_values()
hwmon: (pwm-fan) stop using legacy PWM functions and some cleanups
hwmon: Add AHT10 Temperature and Humidity Sensor Driver
hwmon: (applesmc) Assign boolean values to a bool variable
hwmon: (nct6683) Support ASRock boards
hwmon: (aspeed-pwm-tacho) Switch to using the new API kobj_to_dev()
hwmon: (max6650) Switch to using the new API kobj_to_dev()
hwmon: (pwm-fan) Support multiple fan tachometers
hwmon: (pwm-fan) Store tach data separately
...
Diffstat (limited to 'drivers/hwmon/Kconfig')
-rw-r--r-- | drivers/hwmon/Kconfig | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 1ecf697d8d99..54f04e61fb83 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig @@ -38,19 +38,6 @@ config HWMON_DEBUG_CHIP comment "Native drivers" -config SENSORS_AB8500 - tristate "AB8500 thermal monitoring" - depends on AB8500_GPADC && AB8500_BM && (IIO = y) - default n - help - If you say yes here you get support for the thermal sensor part - of the AB8500 chip. The driver includes thermal management for - AB8500 die and two GPADC channels. The GPADC channel are preferably - used to access sensors outside the AB8500 chip. - - This driver can also be built as a module. If so, the module - will be called abx500-temp. - config SENSORS_ABITUGURU tristate "Abit uGuru (rev 1 & 2)" depends on X86 && DMI @@ -257,6 +244,16 @@ config SENSORS_ADT7475 This driver can also be built as a module. If so, the module will be called adt7475. +config SENSORS_AHT10 + tristate "Aosong AHT10" + depends on I2C + help + If you say yes here, you get support for the Aosong AHT10 + temperature and humidity sensors + + This driver can also be built as a module. If so, the module + will be called aht10. + config SENSORS_AS370 tristate "Synaptics AS370 SoC hardware monitoring driver" help @@ -1136,6 +1133,17 @@ config SENSORS_TC654 This driver can also be built as a module. If so, the module will be called tc654. +config SENSORS_TPS23861 + tristate "Texas Instruments TPS23861 PoE PSE" + depends on I2C + select REGMAP_I2C + help + If you say yes here you get support for Texas Instruments + TPS23861 802.3at PoE PSE chips. + + This driver can also be built as a module. If so, the module + will be called tps23861. + config SENSORS_MENF21BMC_HWMON tristate "MEN 14F021P00 BMC Hardware Monitoring" depends on MFD_MENF21BMC |