diff --git a/CHANGES b/CHANGES index b4a083df..79343613 100644 --- a/CHANGES +++ b/CHANGES @@ -29,6 +29,7 @@ ask CVS about it: File sensors.c: Add xxx_init() calls for drivers added to mkpatch in 2.5.5. Include file i2c-isa.h: No longer required, moved to i2c.h in i2c package Include file sensors.h: Most contents moved to i2c-proc.h in i2c package + Library: Fix some lm87 entries Chip Modules (all ISA): Remove #include "i2c-isa.h" Module i2c-i801: Chip detection cleanup Module lm78: Recognize chipid=0x20 diff --git a/lib/chips.c b/lib/chips.c index c2f9cc6f..ef88ad7b 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -1844,43 +1844,43 @@ static sensors_chip_feature lm87_features[] = SENSORS_MODE_R, LM87_SYSCTL_FAN1, VALUE(2), 0 }, { SENSORS_LM87_FAN2, "fan2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, SENSORS_MODE_R, LM87_SYSCTL_FAN2, VALUE(2), 0 }, - { SENSORS_LM87_FAN1_MIN, "fan1 min", SENSORS_LM87_FAN1, + { SENSORS_LM87_FAN1_MIN, "fan1_min", SENSORS_LM87_FAN1, SENSORS_LM87_FAN1, SENSORS_MODE_RW, LM87_SYSCTL_FAN1, VALUE(1), 0 }, - { SENSORS_LM87_FAN2_MIN, "fan2 min", SENSORS_LM87_FAN2, + { SENSORS_LM87_FAN2_MIN, "fan2_min", SENSORS_LM87_FAN2, SENSORS_LM87_FAN2, SENSORS_MODE_RW, LM87_SYSCTL_FAN2, VALUE(1), 0 }, - { SENSORS_LM87_TEMP3, "CPU2 Temp", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + { SENSORS_LM87_TEMP3, "CPU2_Temp", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, SENSORS_MODE_R, LM87_SYSCTL_TEMP3, VALUE(3), 1 }, - { SENSORS_LM87_TEMP2, "CPU Temp", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + { SENSORS_LM87_TEMP2, "CPU_Temp", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, SENSORS_MODE_R, LM87_SYSCTL_TEMP2, VALUE(3), 1 }, { SENSORS_LM87_TEMP1, "temp1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, SENSORS_MODE_R, LM87_SYSCTL_TEMP1, VALUE(3), 1 }, - { SENSORS_LM87_TEMP1_HYST, "temp_hyst", SENSORS_LM87_TEMP1, + { SENSORS_LM87_TEMP1_HYST, "temp1_min", SENSORS_LM87_TEMP1, SENSORS_LM87_TEMP1, SENSORS_MODE_RW, LM87_SYSCTL_TEMP1, VALUE(2), 1 }, - { SENSORS_LM87_TEMP1_OVER, "temp_over", SENSORS_LM87_TEMP1, + { SENSORS_LM87_TEMP1_OVER, "temp1_max", SENSORS_LM87_TEMP1, SENSORS_LM87_TEMP1, SENSORS_MODE_RW, LM87_SYSCTL_TEMP1, VALUE(1), 1 }, - { SENSORS_LM87_TEMP2_HYST, "temp_hyst", SENSORS_LM87_TEMP2, + { SENSORS_LM87_TEMP2_HYST, "temp2_min", SENSORS_LM87_TEMP2, SENSORS_LM87_TEMP2, SENSORS_MODE_RW, LM87_SYSCTL_TEMP2, VALUE(2), 1 }, - { SENSORS_LM87_TEMP2_OVER, "temp_over", SENSORS_LM87_TEMP2, + { SENSORS_LM87_TEMP2_OVER, "temp2_max", SENSORS_LM87_TEMP2, SENSORS_LM87_TEMP2, SENSORS_MODE_RW, LM87_SYSCTL_TEMP2, VALUE(1), 1 }, - { SENSORS_LM87_TEMP3_HYST, "temp_hyst", SENSORS_LM87_TEMP3, + { SENSORS_LM87_TEMP3_HYST, "temp3_min", SENSORS_LM87_TEMP3, SENSORS_LM87_TEMP3, SENSORS_MODE_RW, LM87_SYSCTL_TEMP3, VALUE(2), 1 }, - { SENSORS_LM87_TEMP3_OVER, "temp_over", SENSORS_LM87_TEMP3, + { SENSORS_LM87_TEMP3_OVER, "temp3_max", SENSORS_LM87_TEMP3, SENSORS_LM87_TEMP3, SENSORS_MODE_RW, LM87_SYSCTL_TEMP3, VALUE(1), 1 }, { SENSORS_LM87_VID, "vid", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, SENSORS_MODE_R, LM87_SYSCTL_VID, VALUE(1), 2 }, /* Ho hum, this will be wrong if fan1 is disabled, but fan2 isn't.. fix?? */ - { SENSORS_LM87_FAN1_DIV, "fan_div", SENSORS_LM87_FAN1, + { SENSORS_LM87_FAN1_DIV, "fan1_div", SENSORS_LM87_FAN1, SENSORS_NO_MAPPING, SENSORS_MODE_RW, LM87_SYSCTL_FAN_DIV, VALUE(1), 0 }, - { SENSORS_LM87_FAN2_DIV, "fan_div", SENSORS_LM87_FAN2, + { SENSORS_LM87_FAN2_DIV, "fan2_div", SENSORS_LM87_FAN2, SENSORS_NO_MAPPING, SENSORS_MODE_RW, LM87_SYSCTL_FAN_DIV, VALUE(2), 0 }, { SENSORS_LM87_ALARMS, "alarms", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,