hwmon/lm85: Export in5,
PATCH 2/5 hwmon/lm85: Export in5,
The SMSC EMC6D100 supports 3 additional voltage channels. The lm85 driver reads the register values for these, but doesn't create the corresponding sysfs files, so the user can't read the values nor write the limits. Create the missing sysfs files.
--- drivers/hwmon/lm85.c | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-)
drivers/hwmon/lm85.c +37 -11
@@ -595,6 +595,9 @@ show_in_reg(1);show_in_reg (2 );show_in_reg (3 );show_in_reg (4 ); +show_in_reg (5 ); +show_in_reg (6 ); +show_in_reg (7 );/* Temps */
@@ -1030,15 +1033,32 @@ static const struct attribute_group lm85 .attrs = lm85_attributes, }; -static struct attribute *lm85_attributes_opt[] = { +static struct attribute *lm85_attributes_in4[] = { &sensor_dev_attr_in4_input.dev_attr.attr, &sensor_dev_attr_in4_min.dev_attr.attr, &sensor_dev_attr_in4_max.dev_attr.attr,NULL }; -static const struct attribute_group lm85_group_opt = { - .attrs = lm85_attributes_opt, +static const struct attribute_group lm85_group_in4 = { + .attrs = lm85_attributes_in4, +}; + +static struct attribute *lm85_attributes_in567[] = { + &sensor_dev_attr_in5_input.dev_attr.attr, + &sensor_dev_attr_in6_input.dev_attr.attr, + &sensor_dev_attr_in7_input.dev_attr.attr, + &sensor_dev_attr_in5_min.dev_attr.attr, + &sensor_dev_attr_in6_min.dev_attr.attr, + &sensor_dev_attr_in7_min.dev_attr.attr, + &sensor_dev_attr_in5_max.dev_attr.attr, + &sensor_dev_attr_in6_max.dev_attr.attr, + &sensor_dev_attr_in7_max.dev_attr.attr, +NULL +}; + +static const struct attribute_group lm85_group_in567 = { + .attrs = lm85_attributes_in567, }; static int lm85_detect(struct i2c_adapter *adapter, int address,
@@ -1186,12 +1206,14 @@ static int lm85_detect(struct i2c_adapteas a sixth digital VID input rather than an analog input. */ data->vid =lm85_read_value (new_client,LM85_REG_VID );if (!(kind = adt7463 && (data->vid &0x80 ))) -if ((err =device_create_file (&new_client->dev, - &sensor_dev_attr_in4_input.dev_attr)) - || (err =device_create_file (&new_client->dev, - &sensor_dev_attr_in4_min.dev_attr)) - || (err =device_create_file (&new_client->dev, - &sensor_dev_attr_in4_max.dev_attr))) +if ((err =sysfs_create_group (&new_client->dev.kobj, + &lm85_group_in4))) + goto ERROR3; + +/* The EMC6D100 has 3 additional voltage inputs */ +if (kind = emc6d100) +if ((err =sysfs_create_group (&new_client->dev.kobj, + &lm85_group_in567))) goto ERROR3; data->class_dev =hwmon_device_register (&new_client->dev);
@@ -1205,7 +1227,9 @@ static int lm85_detect(struct i2c_adapte/* Error out and cleanup code */ ERROR3:sysfs_remove_group (&new_client->dev.kobj, &lm85_group); -sysfs_remove_group (&new_client->dev.kobj, &lm85_group_opt); +sysfs_remove_group (&new_client->dev.kobj, &lm85_group_in4); +if (kind = emc6d100) +sysfs_remove_group (&new_client->dev.kobj, &lm85_group_in567); ERROR2:i2c_detach_client (new_client); ERROR1:
@@ -1219,7 +1243,9 @@ static int lm85_detach_client(struct i2cstruct lm85_data *data =i2c_get_clientdata (client);hwmon_device_unregister (data->class_dev);sysfs_remove_group (&client->dev.kobj, &lm85_group); -sysfs_remove_group (&client->dev.kobj, &lm85_group_opt); +sysfs_remove_group (&client->dev.kobj, &lm85_group_in4); +if (data->type = emc6d100) +sysfs_remove_group (&client->dev.kobj, &lm85_group_in567);i2c_detach_client (client);kfree (data);return 0 ;
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Quoted 111 lines
The future libsensors needs these individual alarm and fault files.
Also delete old and unused alarm defines.
Signed-off-by Jean Delvare <khali at linux-fr.org>--- drivers/hwmon/lm85.c | 60 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 17 deletions(-)drivers/hwmon/lm85.c +40
-17@@ -123,23 +123,6 @@ I2C_CLIENT_INSMOD_6(lm85b, lm85c, adm102#define EMC6D102_REG_EXTEND_ADC3 0x87#define EMC6D102_REG_EXTEND_ADC4 0x88 -#define LM85_ALARM_IN0 0x0001 -#define LM85_ALARM_IN1 0x0002 -#define LM85_ALARM_IN2 0x0004 -#define LM85_ALARM_IN3 0x0008 -#define LM85_ALARM_TEMP1 0x0010 -#define LM85_ALARM_TEMP2 0x0020 -#define LM85_ALARM_TEMP3 0x0040 -#define LM85_ALARM_ALARM2 0x0080 -#define LM85_ALARM_IN4 0x0100 -#define LM85_ALARM_RESERVED 0x0200 -#define LM85_ALARM_FAN1 0x0400 -#define LM85_ALARM_FAN2 0x0800 -#define LM85_ALARM_FAN3 0x1000 -#define LM85_ALARM_FAN4 0x2000 -#define LM85_ALARM_TEMP1_FAULT 0x4000 -#define LM85_ALARM_TEMP3_FAULT 0x8000 -/* Conversions. Rounding and limit checking is only done on the TO_REG variants. Note that you should be a bit careful with which arguments @@ -477,6 +460,32 @@ static ssize_t show_alarms_reg(struct de static DEVICE_ATTR(alarms, S_IRUGO, show_alarms_reg, NULL); +static ssize_t show_alarm (struct device *dev,struct device_attribute *attr, +char *buf) +{ +int nr =to_sensor_dev_attr (attr)->index; +struct lm85_data *data =lm85_update_device (dev); +return sprintf (buf,"%u\n" , (data->alarms >> nr) &1 ); +} + +static SENSOR_DEVICE_ATTR(in0_alarm, S_IRUGO, show_alarm, NULL, 0); +static SENSOR_DEVICE_ATTR(in1_alarm, S_IRUGO, show_alarm, NULL, 1); +static SENSOR_DEVICE_ATTR(in2_alarm, S_IRUGO, show_alarm, NULL, 2); +static SENSOR_DEVICE_ATTR(in3_alarm, S_IRUGO, show_alarm, NULL, 3); +static SENSOR_DEVICE_ATTR(in4_alarm, S_IRUGO, show_alarm, NULL, 8); +static SENSOR_DEVICE_ATTR(in5_alarm, S_IRUGO, show_alarm, NULL, 18); +static SENSOR_DEVICE_ATTR(in6_alarm, S_IRUGO, show_alarm, NULL, 16); +static SENSOR_DEVICE_ATTR(in7_alarm, S_IRUGO, show_alarm, NULL, 17); +static SENSOR_DEVICE_ATTR(temp1_alarm, S_IRUGO, show_alarm, NULL, 4); +static SENSOR_DEVICE_ATTR(temp1_fault, S_IRUGO, show_alarm, NULL, 14); +static SENSOR_DEVICE_ATTR(temp2_alarm, S_IRUGO, show_alarm, NULL, 5); +static SENSOR_DEVICE_ATTR(temp3_alarm, S_IRUGO, show_alarm, NULL, 6); +static SENSOR_DEVICE_ATTR(temp3_fault, S_IRUGO, show_alarm, NULL, 15); +static SENSOR_DEVICE_ATTR(fan1_alarm, S_IRUGO, show_alarm, NULL, 10); +static SENSOR_DEVICE_ATTR(fan2_alarm, S_IRUGO, show_alarm, NULL, 11); +static SENSOR_DEVICE_ATTR(fan3_alarm, S_IRUGO, show_alarm, NULL, 12); +static SENSOR_DEVICE_ATTR(fan4_alarm, S_IRUGO, show_alarm, NULL, 13); +/* pwm */ static ssize_t show_pwm(struct device *dev, struct device_attribute *attr,@@ -966,6 +975,10 @@ static struct attribute *lm85_attributes &sensor_dev_attr_fan2_min.dev_attr.attr, &sensor_dev_attr_fan3_min.dev_attr.attr, &sensor_dev_attr_fan4_min.dev_attr.attr, + &sensor_dev_attr_fan1_alarm.dev_attr.attr, + &sensor_dev_attr_fan2_alarm.dev_attr.attr, + &sensor_dev_attr_fan3_alarm.dev_attr.attr, + &sensor_dev_attr_fan4_alarm.dev_attr.attr, &sensor_dev_attr_pwm1.dev_attr.attr, &sensor_dev_attr_pwm2.dev_attr.attr,@@ -986,6 +999,10 @@ static struct attribute *lm85_attributes &sensor_dev_attr_in1_max.dev_attr.attr, &sensor_dev_attr_in2_max.dev_attr.attr, &sensor_dev_attr_in3_max.dev_attr.attr, + &sensor_dev_attr_in0_alarm.dev_attr.attr, + &sensor_dev_attr_in1_alarm.dev_attr.attr, + &sensor_dev_attr_in2_alarm.dev_attr.attr, + &sensor_dev_attr_in3_alarm.dev_attr.attr, &sensor_dev_attr_temp1_input.dev_attr.attr, &sensor_dev_attr_temp2_input.dev_attr.attr,@@ -996,6 +1013,11 @@ static struct attribute *lm85_attributes &sensor_dev_attr_temp1_max.dev_attr.attr, &sensor_dev_attr_temp2_max.dev_attr.attr, &sensor_dev_attr_temp3_max.dev_attr.attr, + &sensor_dev_attr_temp1_alarm.dev_attr.attr, + &sensor_dev_attr_temp2_alarm.dev_attr.attr, + &sensor_dev_attr_temp3_alarm.dev_attr.attr, + &sensor_dev_attr_temp1_fault.dev_attr.attr, + &sensor_dev_attr_temp3_fault.dev_attr.attr, &sensor_dev_attr_pwm1_auto_channels.dev_attr.attr, &sensor_dev_attr_pwm2_auto_channels.dev_attr.attr,@@ -1037,6 +1059,7 @@ static struct attribute *lm85_attributes &sensor_dev_attr_in4_input.dev_attr.attr, &sensor_dev_attr_in4_min.dev_attr.attr, &sensor_dev_attr_in4_max.dev_attr.attr, + &sensor_dev_attr_in4_alarm.dev_attr.attr, NULL };
drivers/hwmon/lm85.c static struct attribute *lm85_attributes · line 1085
Quoted 9 lines
drivers/hwmon/lm85.c +3
-0@@ -1054,6 +1077,9 @@ static struct attribute *lm85_attributes &sensor_dev_attr_in5_max.dev_attr.attr, &sensor_dev_attr_in6_max.dev_attr.attr, &sensor_dev_attr_in7_max.dev_attr.attr, + &sensor_dev_attr_in5_alarm.dev_attr.attr, + &sensor_dev_attr_in6_alarm.dev_attr.attr, + &sensor_dev_attr_in7_alarm.dev_attr.attr, NULL };
Looks good.
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
This time with the correct mail content. sorry.
Quoted 92 lines
The SMSC EMC6D100 supports 3 additional voltage channels. The lm85 driver reads the register values for these, but doesn't create the corresponding sysfs files, so the user can't read the values nor write the limits. Create the missing sysfs files.
Signed-off-by Jean Delvare <khali at linux-fr.org>--- drivers/hwmon/lm85.c | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-)drivers/hwmon/lm85.c +34
-10@@ -595,6 +595,9 @@ show_in_reg(1);show_in_reg (2 );show_in_reg (3 );show_in_reg (4 ); +show_in_reg (5 ); +show_in_reg (6 ); +show_in_reg (7 );/* Temps */ @@ -1030,15 +1033,32 @@ static const struct attribute_group lm85 .attrs = lm85_attributes, }; -static struct attribute *lm85_attributes_opt[] = { +static struct attribute *lm85_attributes_in4[] = { &sensor_dev_attr_in4_input.dev_attr.attr, &sensor_dev_attr_in4_min.dev_attr.attr, &sensor_dev_attr_in4_max.dev_attr.attr,NULL }; -static const struct attribute_group lm85_group_opt = { - .attrs = lm85_attributes_opt, +static const struct attribute_group lm85_group_in4 = { + .attrs = lm85_attributes_in4, +}; + +static struct attribute *lm85_attributes_in567[] = { + &sensor_dev_attr_in5_input.dev_attr.attr, + &sensor_dev_attr_in6_input.dev_attr.attr, + &sensor_dev_attr_in7_input.dev_attr.attr, + &sensor_dev_attr_in5_min.dev_attr.attr, + &sensor_dev_attr_in6_min.dev_attr.attr, + &sensor_dev_attr_in7_min.dev_attr.attr, + &sensor_dev_attr_in5_max.dev_attr.attr, + &sensor_dev_attr_in6_max.dev_attr.attr, + &sensor_dev_attr_in7_max.dev_attr.attr, +NULL +}; + +static const struct attribute_group lm85_group_in567 = { + .attrs = lm85_attributes_in567, }; static int lm85_detect(struct i2c_adapter *adapter, int address,@@ -1186,12 +1206,14 @@ static int lm85_detect(struct i2c_adapteas a sixth digital VID input rather than an analog input. */ data->vid =lm85_read_value (new_client,LM85_REG_VID );if (!(kind = adt7463 && (data->vid &0x80 ))) -if ((err =device_create_file (&new_client->dev, - &sensor_dev_attr_in4_input.dev_attr)) - || (err =device_create_file (&new_client->dev, - &sensor_dev_attr_in4_min.dev_attr)) - || (err =device_create_file (&new_client->dev, - &sensor_dev_attr_in4_max.dev_attr))) +if ((err =sysfs_create_group (&new_client->dev.kobj, + &lm85_group_in4))) + goto ERROR3; + +/* The EMC6D100 has 3 additional voltage inputs */ +if (kind = emc6d100) +if ((err =sysfs_create_group (&new_client->dev.kobj, + &lm85_group_in567))) goto ERROR3; data->class_dev =hwmon_device_register (&new_client->dev);@@ -1205,7 +1227,9 @@ static int lm85_detect(struct i2c_adapte/* Error out and cleanup code */ ERROR3:sysfs_remove_group (&new_client->dev.kobj, &lm85_group); -sysfs_remove_group (&new_client->dev.kobj, &lm85_group_opt); +sysfs_remove_group (&new_client->dev.kobj, &lm85_group_in4); +if (kind = emc6d100) +sysfs_remove_group (&new_client->dev.kobj, &lm85_group_in567); ERROR2:i2c_detach_client (new_client); ERROR1:
drivers/hwmon/lm85.c static int lm85_detach_client(struct i2c · line 1251
Quoted 10 lines
drivers/hwmon/lm85.c +3
-1@@ -1219,7 +1243,9 @@ static int lm85_detach_client(struct i2cstruct lm85_data *data =i2c_get_clientdata (client);hwmon_device_unregister (data->class_dev);sysfs_remove_group (&client->dev.kobj, &lm85_group); -sysfs_remove_group (&client->dev.kobj, &lm85_group_opt); +sysfs_remove_group (&client->dev.kobj, &lm85_group_in4); +if (data->type = emc6d100) +sysfs_remove_group (&client->dev.kobj, &lm85_group_in567);i2c_detach_client (client);kfree (data);return 0 ;
Looks good.
_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors