aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/emc1403.c
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2014-05-12 13:48:02 -0400
committerGuenter Roeck <linux@roeck-us.net>2014-05-21 19:02:24 -0400
commitd8850c19b589bd364d3c7cd1273193e6dfe83fd9 (patch)
treeb421077851a66855e9834e5489d865bef7b6f896 /drivers/hwmon/emc1403.c
parent4cab259f866ed33571c5f9e3f4bc2799ab64ba45 (diff)
hwmon: (emc1403) Report external diode fault status
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon/emc1403.c')
-rw-r--r--drivers/hwmon/emc1403.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hwmon/emc1403.c b/drivers/hwmon/emc1403.c
index 3c9a8a94753f..9acd5bfcfa01 100644
--- a/drivers/hwmon/emc1403.c
+++ b/drivers/hwmon/emc1403.c
@@ -188,6 +188,7 @@ static SENSOR_DEVICE_ATTR(temp2_max, S_IRUGO | S_IWUSR,
188static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO | S_IWUSR, 188static SENSOR_DEVICE_ATTR(temp2_crit, S_IRUGO | S_IWUSR,
189 show_temp, store_temp, 0x19); 189 show_temp, store_temp, 0x19);
190static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 0x01); 190static SENSOR_DEVICE_ATTR(temp2_input, S_IRUGO, show_temp, NULL, 0x01);
191static SENSOR_DEVICE_ATTR_2(temp2_fault, S_IRUGO, show_bit, NULL, 0x1b, 0x02);
191static SENSOR_DEVICE_ATTR_2(temp2_min_alarm, S_IRUGO, 192static SENSOR_DEVICE_ATTR_2(temp2_min_alarm, S_IRUGO,
192 show_bit, NULL, 0x36, 0x02); 193 show_bit, NULL, 0x36, 0x02);
193static SENSOR_DEVICE_ATTR_2(temp2_max_alarm, S_IRUGO, 194static SENSOR_DEVICE_ATTR_2(temp2_max_alarm, S_IRUGO,
@@ -204,6 +205,7 @@ static SENSOR_DEVICE_ATTR(temp3_max, S_IRUGO | S_IWUSR,
204static SENSOR_DEVICE_ATTR(temp3_crit, S_IRUGO | S_IWUSR, 205static SENSOR_DEVICE_ATTR(temp3_crit, S_IRUGO | S_IWUSR,
205 show_temp, store_temp, 0x1A); 206 show_temp, store_temp, 0x1A);
206static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 0x23); 207static SENSOR_DEVICE_ATTR(temp3_input, S_IRUGO, show_temp, NULL, 0x23);
208static SENSOR_DEVICE_ATTR_2(temp3_fault, S_IRUGO, show_bit, NULL, 0x1b, 0x04);
207static SENSOR_DEVICE_ATTR_2(temp3_min_alarm, S_IRUGO, 209static SENSOR_DEVICE_ATTR_2(temp3_min_alarm, S_IRUGO,
208 show_bit, NULL, 0x36, 0x04); 210 show_bit, NULL, 0x36, 0x04);
209static SENSOR_DEVICE_ATTR_2(temp3_max_alarm, S_IRUGO, 211static SENSOR_DEVICE_ATTR_2(temp3_max_alarm, S_IRUGO,
@@ -220,6 +222,7 @@ static SENSOR_DEVICE_ATTR(temp4_max, S_IRUGO | S_IWUSR,
220static SENSOR_DEVICE_ATTR(temp4_crit, S_IRUGO | S_IWUSR, 222static SENSOR_DEVICE_ATTR(temp4_crit, S_IRUGO | S_IWUSR,
221 show_temp, store_temp, 0x30); 223 show_temp, store_temp, 0x30);
222static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, show_temp, NULL, 0x2A); 224static SENSOR_DEVICE_ATTR(temp4_input, S_IRUGO, show_temp, NULL, 0x2A);
225static SENSOR_DEVICE_ATTR_2(temp4_fault, S_IRUGO, show_bit, NULL, 0x1b, 0x08);
223static SENSOR_DEVICE_ATTR_2(temp4_min_alarm, S_IRUGO, 226static SENSOR_DEVICE_ATTR_2(temp4_min_alarm, S_IRUGO,
224 show_bit, NULL, 0x36, 0x08); 227 show_bit, NULL, 0x36, 0x08);
225static SENSOR_DEVICE_ATTR_2(temp4_max_alarm, S_IRUGO, 228static SENSOR_DEVICE_ATTR_2(temp4_max_alarm, S_IRUGO,
@@ -258,6 +261,7 @@ static struct attribute *emc1403_attrs[] = {
258 &sensor_dev_attr_temp1_max_alarm.dev_attr.attr, 261 &sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
259 &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr, 262 &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr,
260 263
264 &sensor_dev_attr_temp2_fault.dev_attr.attr,
261 &sensor_dev_attr_temp2_min_alarm.dev_attr.attr, 265 &sensor_dev_attr_temp2_min_alarm.dev_attr.attr,
262 &sensor_dev_attr_temp2_max_alarm.dev_attr.attr, 266 &sensor_dev_attr_temp2_max_alarm.dev_attr.attr,
263 &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr, 267 &sensor_dev_attr_temp2_crit_alarm.dev_attr.attr,
@@ -266,6 +270,7 @@ static struct attribute *emc1403_attrs[] = {
266 &sensor_dev_attr_temp3_max.dev_attr.attr, 270 &sensor_dev_attr_temp3_max.dev_attr.attr,
267 &sensor_dev_attr_temp3_crit.dev_attr.attr, 271 &sensor_dev_attr_temp3_crit.dev_attr.attr,
268 &sensor_dev_attr_temp3_input.dev_attr.attr, 272 &sensor_dev_attr_temp3_input.dev_attr.attr,
273 &sensor_dev_attr_temp3_fault.dev_attr.attr,
269 &sensor_dev_attr_temp3_min_alarm.dev_attr.attr, 274 &sensor_dev_attr_temp3_min_alarm.dev_attr.attr,
270 &sensor_dev_attr_temp3_max_alarm.dev_attr.attr, 275 &sensor_dev_attr_temp3_max_alarm.dev_attr.attr,
271 &sensor_dev_attr_temp3_crit_alarm.dev_attr.attr, 276 &sensor_dev_attr_temp3_crit_alarm.dev_attr.attr,
@@ -282,6 +287,7 @@ static struct attribute *emc1404_attrs[] = {
282 &sensor_dev_attr_temp4_max.dev_attr.attr, 287 &sensor_dev_attr_temp4_max.dev_attr.attr,
283 &sensor_dev_attr_temp4_crit.dev_attr.attr, 288 &sensor_dev_attr_temp4_crit.dev_attr.attr,
284 &sensor_dev_attr_temp4_input.dev_attr.attr, 289 &sensor_dev_attr_temp4_input.dev_attr.attr,
290 &sensor_dev_attr_temp4_fault.dev_attr.attr,
285 &sensor_dev_attr_temp4_min_alarm.dev_attr.attr, 291 &sensor_dev_attr_temp4_min_alarm.dev_attr.attr,
286 &sensor_dev_attr_temp4_max_alarm.dev_attr.attr, 292 &sensor_dev_attr_temp4_max_alarm.dev_attr.attr,
287 &sensor_dev_attr_temp4_crit_alarm.dev_attr.attr, 293 &sensor_dev_attr_temp4_crit_alarm.dev_attr.attr,