diff options
author | Guenter Roeck <linux@roeck-us.net> | 2016-06-20 14:10:33 -0400 |
---|---|---|
committer | Guenter Roeck <linux@roeck-us.net> | 2016-09-09 00:34:15 -0400 |
commit | 9b26947ce5b6a6d5f260d9564195e8971cc9713d (patch) | |
tree | 1c705660a2a6ee0f0bb3e2e3285da8cd4c4252d8 /drivers/hwmon | |
parent | 00d616cf872bb552a6853df288efcdb9f937a489 (diff) |
hwmon: (core) Add current attribute support to new API
Acked-by: Punit Agrawal <punit.agrawal@arm.com>
Reviewed-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r-- | drivers/hwmon/hwmon.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index 7697dfa92558..9229229a99a5 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c | |||
@@ -260,6 +260,7 @@ static struct attribute *hwmon_genattr(struct device *dev, | |||
260 | static const char * const hwmon_chip_attr_templates[] = { | 260 | static const char * const hwmon_chip_attr_templates[] = { |
261 | [hwmon_chip_temp_reset_history] = "temp_reset_history", | 261 | [hwmon_chip_temp_reset_history] = "temp_reset_history", |
262 | [hwmon_chip_in_reset_history] = "in_reset_history", | 262 | [hwmon_chip_in_reset_history] = "in_reset_history", |
263 | [hwmon_chip_curr_reset_history] = "curr_reset_history", | ||
263 | [hwmon_chip_update_interval] = "update_interval", | 264 | [hwmon_chip_update_interval] = "update_interval", |
264 | [hwmon_chip_alarms] = "alarms", | 265 | [hwmon_chip_alarms] = "alarms", |
265 | }; | 266 | }; |
@@ -309,16 +310,36 @@ static const char * const hwmon_in_attr_templates[] = { | |||
309 | [hwmon_in_crit_alarm] = "in%d_crit_alarm", | 310 | [hwmon_in_crit_alarm] = "in%d_crit_alarm", |
310 | }; | 311 | }; |
311 | 312 | ||
313 | static const char * const hwmon_curr_attr_templates[] = { | ||
314 | [hwmon_curr_input] = "curr%d_input", | ||
315 | [hwmon_curr_min] = "curr%d_min", | ||
316 | [hwmon_curr_max] = "curr%d_max", | ||
317 | [hwmon_curr_lcrit] = "curr%d_lcrit", | ||
318 | [hwmon_curr_crit] = "curr%d_crit", | ||
319 | [hwmon_curr_average] = "curr%d_average", | ||
320 | [hwmon_curr_lowest] = "curr%d_lowest", | ||
321 | [hwmon_curr_highest] = "curr%d_highest", | ||
322 | [hwmon_curr_reset_history] = "curr%d_reset_history", | ||
323 | [hwmon_curr_label] = "curr%d_label", | ||
324 | [hwmon_curr_alarm] = "curr%d_alarm", | ||
325 | [hwmon_curr_min_alarm] = "curr%d_min_alarm", | ||
326 | [hwmon_curr_max_alarm] = "curr%d_max_alarm", | ||
327 | [hwmon_curr_lcrit_alarm] = "curr%d_lcrit_alarm", | ||
328 | [hwmon_curr_crit_alarm] = "curr%d_crit_alarm", | ||
329 | }; | ||
330 | |||
312 | static const char * const *__templates[] = { | 331 | static const char * const *__templates[] = { |
313 | [hwmon_chip] = hwmon_chip_attr_templates, | 332 | [hwmon_chip] = hwmon_chip_attr_templates, |
314 | [hwmon_temp] = hwmon_temp_attr_templates, | 333 | [hwmon_temp] = hwmon_temp_attr_templates, |
315 | [hwmon_in] = hwmon_in_attr_templates, | 334 | [hwmon_in] = hwmon_in_attr_templates, |
335 | [hwmon_curr] = hwmon_curr_attr_templates, | ||
316 | }; | 336 | }; |
317 | 337 | ||
318 | static const int __templates_size[] = { | 338 | static const int __templates_size[] = { |
319 | [hwmon_chip] = ARRAY_SIZE(hwmon_chip_attr_templates), | 339 | [hwmon_chip] = ARRAY_SIZE(hwmon_chip_attr_templates), |
320 | [hwmon_temp] = ARRAY_SIZE(hwmon_temp_attr_templates), | 340 | [hwmon_temp] = ARRAY_SIZE(hwmon_temp_attr_templates), |
321 | [hwmon_in] = ARRAY_SIZE(hwmon_in_attr_templates), | 341 | [hwmon_in] = ARRAY_SIZE(hwmon_in_attr_templates), |
342 | [hwmon_curr] = ARRAY_SIZE(hwmon_curr_attr_templates), | ||
322 | }; | 343 | }; |
323 | 344 | ||
324 | static int hwmon_num_channel_attrs(const struct hwmon_channel_info *info) | 345 | static int hwmon_num_channel_attrs(const struct hwmon_channel_info *info) |