diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 20:14:11 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-01-27 20:14:11 +0300 |
commit | 35417d57efaaf06894868a2e8dfcd7b9f31bd0bf (patch) | |
tree | 8178ec19292ed8bae5e883e100afee4b463ef92a /drivers/hwmon/hwmon.c | |
parent | 189fc98efe59b9b0a49a4f29ee3d91eeded4e4d4 (diff) | |
parent | fd8bdb23b91876ac1e624337bb88dc1dcc21d67e (diff) |
Merge tag 'hwmon-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"core:
- Add support for enable attributes to hwmon core
- Add intrusion templates
pmbus:
- Support for Infineon Multi-phase xdpe122 family controllers
- Support for Intel IMVP9 and AMD 6.25mV modes
- Support for vid mode detection per page bases
- Detect if chip is write protected
- Support for MAX20730, MAX20734, MAX20743, MAX20796, UCD90320,
TPS53688
- Various improvements to ibm-cffps driver
k10temp:
- Support for additional temperature sensors as well as voltage and
current telemetry for Zen CPUs
w83627ehf:
- Remove support for NCT6775, NCT6776 (they have their own driver)
New drivers:
- ADM1177
- MAX31730
- Driver for disk and solid state drives with temperature sensors
Other:
- pwm-fan: stop fan on shutdown"
* tag 'hwmon-for-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (35 commits)
hwmon: (k10temp) Display up to eight sets of CCD temperatures
hwmon: (k10temp) Add debugfs support
hwmon: (k10temp) Don't show temperature limits on Ryzen (Zen) CPUs
hwmon: (k10temp) Show core and SoC current and voltages on Ryzen CPUs
hwmon: (k10temp) Report temperatures per CPU die
hmon: (k10temp) Convert to use devm_hwmon_device_register_with_info
hwmon: (k10temp) Use bitops
hwmon: (pwm-fan) stop fan on shutdown
MAINTAINERS: add entry for ADM1177 driver
dt-binding: hwmon: Add documentation for ADM1177
hwmon: (adm1177) Add ADM1177 Hot Swap Controller and Digital Power Monitor driver
docs: hwmon: Include 'xdpe12284.rst' into docs
hwmon: (pmbus) Add support for Infineon Multi-phase xdpe122 family controllers
hwmon: (pmbus/tps53679) Extend device list supported by driver
hwmon: (pmbus/core) Add support for Intel IMVP9 and AMD 6.25mV modes
hwmon: (pmbus/core) Add support for vid mode detection per page bases
hwmon: (pmbus/ibm-cffps) Prevent writing on_off_config with bad data
hwmon: (w83627ehf) Remove set but not used variable 'fan4min'
hwmon: Driver for disk and solid state drives with temperature sensors
hwmon: (pmbus/ibm-cffps) Fix the LED behavior when turned off
...
Diffstat (limited to 'drivers/hwmon/hwmon.c')
-rw-r--r-- | drivers/hwmon/hwmon.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index d018b20089ec..6a30fb453f7a 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c @@ -188,7 +188,7 @@ static int hwmon_thermal_add_sensor(struct device *dev, int index) static int hwmon_attr_base(enum hwmon_sensor_types type) { - if (type == hwmon_in) + if (type == hwmon_in || type == hwmon_intrusion) return 0; return 1; } @@ -343,6 +343,7 @@ static const char * const hwmon_chip_attrs[] = { }; static const char * const hwmon_temp_attr_templates[] = { + [hwmon_temp_enable] = "temp%d_enable", [hwmon_temp_input] = "temp%d_input", [hwmon_temp_type] = "temp%d_type", [hwmon_temp_lcrit] = "temp%d_lcrit", @@ -370,6 +371,7 @@ static const char * const hwmon_temp_attr_templates[] = { }; static const char * const hwmon_in_attr_templates[] = { + [hwmon_in_enable] = "in%d_enable", [hwmon_in_input] = "in%d_input", [hwmon_in_min] = "in%d_min", [hwmon_in_max] = "in%d_max", @@ -385,10 +387,10 @@ static const char * const hwmon_in_attr_templates[] = { [hwmon_in_max_alarm] = "in%d_max_alarm", [hwmon_in_lcrit_alarm] = "in%d_lcrit_alarm", [hwmon_in_crit_alarm] = "in%d_crit_alarm", - [hwmon_in_enable] = "in%d_enable", }; static const char * const hwmon_curr_attr_templates[] = { + [hwmon_curr_enable] = "curr%d_enable", [hwmon_curr_input] = "curr%d_input", [hwmon_curr_min] = "curr%d_min", [hwmon_curr_max] = "curr%d_max", @@ -407,6 +409,7 @@ static const char * const hwmon_curr_attr_templates[] = { }; static const char * const hwmon_power_attr_templates[] = { + [hwmon_power_enable] = "power%d_enable", [hwmon_power_average] = "power%d_average", [hwmon_power_average_interval] = "power%d_average_interval", [hwmon_power_average_interval_max] = "power%d_interval_max", @@ -438,11 +441,13 @@ static const char * const hwmon_power_attr_templates[] = { }; static const char * const hwmon_energy_attr_templates[] = { + [hwmon_energy_enable] = "energy%d_enable", [hwmon_energy_input] = "energy%d_input", [hwmon_energy_label] = "energy%d_label", }; static const char * const hwmon_humidity_attr_templates[] = { + [hwmon_humidity_enable] = "humidity%d_enable", [hwmon_humidity_input] = "humidity%d_input", [hwmon_humidity_label] = "humidity%d_label", [hwmon_humidity_min] = "humidity%d_min", @@ -454,6 +459,7 @@ static const char * const hwmon_humidity_attr_templates[] = { }; static const char * const hwmon_fan_attr_templates[] = { + [hwmon_fan_enable] = "fan%d_enable", [hwmon_fan_input] = "fan%d_input", [hwmon_fan_label] = "fan%d_label", [hwmon_fan_min] = "fan%d_min", @@ -474,6 +480,11 @@ static const char * const hwmon_pwm_attr_templates[] = { [hwmon_pwm_freq] = "pwm%d_freq", }; +static const char * const hwmon_intrusion_attr_templates[] = { + [hwmon_intrusion_alarm] = "intrusion%d_alarm", + [hwmon_intrusion_beep] = "intrusion%d_beep", +}; + static const char * const *__templates[] = { [hwmon_chip] = hwmon_chip_attrs, [hwmon_temp] = hwmon_temp_attr_templates, @@ -484,6 +495,7 @@ static const char * const *__templates[] = { [hwmon_humidity] = hwmon_humidity_attr_templates, [hwmon_fan] = hwmon_fan_attr_templates, [hwmon_pwm] = hwmon_pwm_attr_templates, + [hwmon_intrusion] = hwmon_intrusion_attr_templates, }; static const int __templates_size[] = { @@ -496,6 +508,7 @@ static const int __templates_size[] = { [hwmon_humidity] = ARRAY_SIZE(hwmon_humidity_attr_templates), [hwmon_fan] = ARRAY_SIZE(hwmon_fan_attr_templates), [hwmon_pwm] = ARRAY_SIZE(hwmon_pwm_attr_templates), + [hwmon_intrusion] = ARRAY_SIZE(hwmon_intrusion_attr_templates), }; static int hwmon_num_channel_attrs(const struct hwmon_channel_info *info) |