Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 13ff05e9f87101407445f79c7402aca087ddbd02

Authored by Jean Delvare
Committed by Mark M. Hoffman
1 parent 1f08af7ea9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

hwmon: (via686a) Add individual alarm files 

The new libsensors needs these individual alarm files.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Juerg Haefliger <juergh at gmail.com>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>

Showing 1 changed file with 28 additions and 0 deletions Side-by-side Diff

drivers/hwmon/via686a.c
Diff comments   View file @ 13ff05e
... ... @@ -533,6 +533,24 @@
533 533 }
534 534 static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
535 535  
  536 +static ssize_t show_alarm(struct device *dev, struct device_attribute *attr,
  537 + char *buf)
  538 +{
  539 + int bitnr = to_sensor_dev_attr(attr)->index;
  540 + struct via686a_data *data = via686a_update_device(dev);
  541 + return sprintf(buf, "%u\n", (data->alarms >> bitnr) & 1);
  542 +}
  543 +static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0);
  544 +static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1);
  545 +static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2);
  546 +static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3);
  547 +static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8);
  548 +static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4);
  549 +static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 11);
  550 +static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 15);
  551 +static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 6);
  552 +static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 7);
  553 +
536 554 static ssize_t show_name(struct device *dev, struct device_attribute
537 555 *devattr, char *buf)
538 556 {
... ... @@ -557,6 +575,11 @@
557 575 &sensor_dev_attr_in2_max.dev_attr.attr,
558 576 &sensor_dev_attr_in3_max.dev_attr.attr,
559 577 &sensor_dev_attr_in4_max.dev_attr.attr,
  578 + &sensor_dev_attr_in0_alarm.dev_attr.attr,
  579 + &sensor_dev_attr_in1_alarm.dev_attr.attr,
  580 + &sensor_dev_attr_in2_alarm.dev_attr.attr,
  581 + &sensor_dev_attr_in3_alarm.dev_attr.attr,
  582 + &sensor_dev_attr_in4_alarm.dev_attr.attr,
560 583  
561 584 &sensor_dev_attr_temp1_input.dev_attr.attr,
562 585 &sensor_dev_attr_temp2_input.dev_attr.attr,
... ... @@ -567,6 +590,9 @@
567 590 &sensor_dev_attr_temp1_max_hyst.dev_attr.attr,
568 591 &sensor_dev_attr_temp2_max_hyst.dev_attr.attr,
569 592 &sensor_dev_attr_temp3_max_hyst.dev_attr.attr,
  593 + &sensor_dev_attr_temp1_alarm.dev_attr.attr,
  594 + &sensor_dev_attr_temp2_alarm.dev_attr.attr,
  595 + &sensor_dev_attr_temp3_alarm.dev_attr.attr,
570 596  
571 597 &sensor_dev_attr_fan1_input.dev_attr.attr,
572 598 &sensor_dev_attr_fan2_input.dev_attr.attr,
... ... @@ -574,6 +600,8 @@
574 600 &sensor_dev_attr_fan2_min.dev_attr.attr,
575 601 &sensor_dev_attr_fan1_div.dev_attr.attr,
576 602 &sensor_dev_attr_fan2_div.dev_attr.attr,
  603 + &sensor_dev_attr_fan1_alarm.dev_attr.attr,
  604 + &sensor_dev_attr_fan2_alarm.dev_attr.attr,
577 605  
578 606 &dev_attr_alarms.attr,
579 607 &dev_attr_name.attr,