Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
hwmon: (adm1031) Add individual alarm and fault files
The new libsensors needs these.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
authored by
Jean Delvare
and committed by
Mark M. Hoffman
050ab878
c801082d
+38
drivers/hwmon/adm1031.c
+38
drivers/hwmon/adm1031.c
···
669
669
670
670
static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
671
671
672
+
static ssize_t show_alarm(struct device *dev,
673
+
struct device_attribute *attr, char *buf)
674
+
{
675
+
int bitnr = to_sensor_dev_attr(attr)->index;
676
+
struct adm1031_data *data = adm1031_update_device(dev);
677
+
return sprintf(buf, "%d\n", (data->alarm >> bitnr) & 1);
678
+
}
679
+
680
+
static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 0);
681
+
static SENSOR_DEVICE_ATTR(fan1_fault, S_IRUGO, show_alarm, NULL, 1);
682
+
static SENSOR_DEVICE_ATTR(temp2_max_alarm, S_IRUGO, show_alarm, NULL, 2);
683
+
static SENSOR_DEVICE_ATTR(temp2_min_alarm, S_IRUGO, show_alarm, NULL, 3);
684
+
static SENSOR_DEVICE_ATTR(temp2_crit_alarm, S_IRUGO, show_alarm, NULL, 4);
685
+
static SENSOR_DEVICE_ATTR(temp2_fault, S_IRUGO, show_alarm, NULL, 5);
686
+
static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL, 6);
687
+
static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL, 7);
688
+
static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 8);
689
+
static SENSOR_DEVICE_ATTR(fan2_fault, S_IRUGO, show_alarm, NULL, 9);
690
+
static SENSOR_DEVICE_ATTR(temp3_max_alarm, S_IRUGO, show_alarm, NULL, 10);
691
+
static SENSOR_DEVICE_ATTR(temp3_min_alarm, S_IRUGO, show_alarm, NULL, 11);
692
+
static SENSOR_DEVICE_ATTR(temp3_crit_alarm, S_IRUGO, show_alarm, NULL, 12);
693
+
static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 13);
694
+
static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL, 14);
672
695
673
696
static int adm1031_attach_adapter(struct i2c_adapter *adapter)
674
697
{
···
704
681
&sensor_dev_attr_fan1_input.dev_attr.attr,
705
682
&sensor_dev_attr_fan1_div.dev_attr.attr,
706
683
&sensor_dev_attr_fan1_min.dev_attr.attr,
684
+
&sensor_dev_attr_fan1_alarm.dev_attr.attr,
685
+
&sensor_dev_attr_fan1_fault.dev_attr.attr,
707
686
&sensor_dev_attr_pwm1.dev_attr.attr,
708
687
&sensor_dev_attr_auto_fan1_channel.dev_attr.attr,
709
688
&sensor_dev_attr_temp1_input.dev_attr.attr,
710
689
&sensor_dev_attr_temp1_min.dev_attr.attr,
690
+
&sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
711
691
&sensor_dev_attr_temp1_max.dev_attr.attr,
692
+
&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
712
693
&sensor_dev_attr_temp1_crit.dev_attr.attr,
694
+
&sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
713
695
&sensor_dev_attr_temp2_input.dev_attr.attr,
714
696
&sensor_dev_attr_temp2_min.dev_attr.attr,
697
+
&sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
715
698
&sensor_dev_attr_temp2_max.dev_attr.attr,
699
+
&sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
716
700
&sensor_dev_attr_temp2_crit.dev_attr.attr,
701
+
&sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
702
+
&sensor_dev_attr_temp2_fault.dev_attr.attr,
717
703
718
704
&sensor_dev_attr_auto_temp1_off.dev_attr.attr,
719
705
&sensor_dev_attr_auto_temp1_min.dev_attr.attr,
···
747
715
&sensor_dev_attr_fan2_input.dev_attr.attr,
748
716
&sensor_dev_attr_fan2_div.dev_attr.attr,
749
717
&sensor_dev_attr_fan2_min.dev_attr.attr,
718
+
&sensor_dev_attr_fan2_alarm.dev_attr.attr,
719
+
&sensor_dev_attr_fan2_fault.dev_attr.attr,
750
720
&sensor_dev_attr_pwm2.dev_attr.attr,
751
721
&sensor_dev_attr_auto_fan2_channel.dev_attr.attr,
752
722
&sensor_dev_attr_temp3_input.dev_attr.attr,
753
723
&sensor_dev_attr_temp3_min.dev_attr.attr,
724
+
&sensor_dev_attr_temp3_min_alarm.dev_attr.attr,
754
725
&sensor_dev_attr_temp3_max.dev_attr.attr,
726
+
&sensor_dev_attr_temp3_max_alarm.dev_attr.attr,
755
727
&sensor_dev_attr_temp3_crit.dev_attr.attr,
728
+
&sensor_dev_attr_temp3_crit_alarm.dev_attr.attr,
729
+
&sensor_dev_attr_temp3_fault.dev_attr.attr,
756
730
&sensor_dev_attr_auto_temp3_off.dev_attr.attr,
757
731
&sensor_dev_attr_auto_temp3_min.dev_attr.attr,
758
732
&sensor_dev_attr_auto_temp3_max.dev_attr.attr,