diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2016-06-20 14:38:37 -0400 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2016-09-09 00:34:15 -0400 |
| commit | 6bfcca44a6e7b0a6d92eab39c4cb830516b9568c (patch) | |
| tree | 1840732f43c07d5082385df07afb06143d9ce40b /drivers/hwmon | |
| parent | b308f5c744522de020da4706718de9076adeada7 (diff) | |
hwmon: (core) Add energy and humidity 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 | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index 85f4e27548cb..2dd4e0acfe12 100644 --- a/drivers/hwmon/hwmon.c +++ b/drivers/hwmon/hwmon.c | |||
| @@ -356,12 +356,30 @@ static const char * const hwmon_power_attr_templates[] = { | |||
| 356 | [hwmon_power_crit_alarm] = "power%d_crit_alarm", | 356 | [hwmon_power_crit_alarm] = "power%d_crit_alarm", |
| 357 | }; | 357 | }; |
| 358 | 358 | ||
| 359 | static const char * const hwmon_energy_attr_templates[] = { | ||
| 360 | [hwmon_energy_input] = "energy%d_input", | ||
| 361 | [hwmon_energy_label] = "energy%d_label", | ||
| 362 | }; | ||
| 363 | |||
| 364 | static const char * const hwmon_humidity_attr_templates[] = { | ||
| 365 | [hwmon_humidity_input] = "humidity%d_input", | ||
| 366 | [hwmon_humidity_label] = "humidity%d_label", | ||
| 367 | [hwmon_humidity_min] = "humidity%d_min", | ||
| 368 | [hwmon_humidity_min_hyst] = "humidity%d_min_hyst", | ||
| 369 | [hwmon_humidity_max] = "humidity%d_max", | ||
| 370 | [hwmon_humidity_max_hyst] = "humidity%d_max_hyst", | ||
| 371 | [hwmon_humidity_alarm] = "humidity%d_alarm", | ||
| 372 | [hwmon_humidity_fault] = "humidity%d_fault", | ||
| 373 | }; | ||
| 374 | |||
| 359 | static const char * const *__templates[] = { | 375 | static const char * const *__templates[] = { |
| 360 | [hwmon_chip] = hwmon_chip_attr_templates, | 376 | [hwmon_chip] = hwmon_chip_attr_templates, |
| 361 | [hwmon_temp] = hwmon_temp_attr_templates, | 377 | [hwmon_temp] = hwmon_temp_attr_templates, |
| 362 | [hwmon_in] = hwmon_in_attr_templates, | 378 | [hwmon_in] = hwmon_in_attr_templates, |
| 363 | [hwmon_curr] = hwmon_curr_attr_templates, | 379 | [hwmon_curr] = hwmon_curr_attr_templates, |
| 364 | [hwmon_power] = hwmon_power_attr_templates, | 380 | [hwmon_power] = hwmon_power_attr_templates, |
| 381 | [hwmon_energy] = hwmon_energy_attr_templates, | ||
| 382 | [hwmon_humidity] = hwmon_humidity_attr_templates, | ||
| 365 | }; | 383 | }; |
| 366 | 384 | ||
| 367 | static const int __templates_size[] = { | 385 | static const int __templates_size[] = { |
| @@ -370,6 +388,8 @@ static const int __templates_size[] = { | |||
| 370 | [hwmon_in] = ARRAY_SIZE(hwmon_in_attr_templates), | 388 | [hwmon_in] = ARRAY_SIZE(hwmon_in_attr_templates), |
| 371 | [hwmon_curr] = ARRAY_SIZE(hwmon_curr_attr_templates), | 389 | [hwmon_curr] = ARRAY_SIZE(hwmon_curr_attr_templates), |
| 372 | [hwmon_power] = ARRAY_SIZE(hwmon_power_attr_templates), | 390 | [hwmon_power] = ARRAY_SIZE(hwmon_power_attr_templates), |
| 391 | [hwmon_energy] = ARRAY_SIZE(hwmon_energy_attr_templates), | ||
| 392 | [hwmon_humidity] = ARRAY_SIZE(hwmon_humidity_attr_templates), | ||
| 373 | }; | 393 | }; |
| 374 | 394 | ||
| 375 | static int hwmon_num_channel_attrs(const struct hwmon_channel_info *info) | 395 | static int hwmon_num_channel_attrs(const struct hwmon_channel_info *info) |