From c623fd88432ba78e3380bc1343e0f3102b3b7580 Mon Sep 17 00:00:00 2001 From: "Mark D. Studebaker" Date: Thu, 31 Jan 2002 03:21:11 +0000 Subject: [PATCH] tkt 800 fix part 2. For lm78, 78-j, 79, w83781d, and as99127f, the chips have integral inverters, so the compute lines are inverting. Therefore the min register is really max and vice versa. So the library was wrong, but sensors.conf.eg was wrong too, so the chip got programmed correctly but 'sensors' printed min and max backwards. This was a different situation than for the previous fix to sensors.conf.eg, where the chips were programmed wrong due solely to sensors.conf.eg being incorrect. In this fix we change the library and sensors.conf.eg. The chip is still programmed right by 'sensors -s' (since the library and sensors.conf changes cancel each other out) but 'sensors' now prints correctly. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1305 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 6 +- etc/sensors.conf.eg | 16 ++-- lib/chips.c | 182 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 176 insertions(+), 28 deletions(-) diff --git a/CHANGES b/CHANGES index fc58aa39..cc98cb11 100644 --- a/CHANGES +++ b/CHANGES @@ -22,9 +22,11 @@ ask CVS about it: File sensors.conf.eg: Un-ignore it87 in8, temp3, fan3; add adm1021 section; add lm87 AIN[1,2] template; swap negative voltage limits for 782d,783s,627hf, - 697hf,it87; add more it87 help + 697hf,it87; add more it87 help; swap neg. voltage + limits for lm78, lm78-j, lm79, as99127f Library: Add PCF8591, W83697HF, ADM1023 support; - fix w83* fan_min computes + fix w83* fan_min computes; + swap negative voltage limits for lm78, lm78-j, lm79, as99127f Module adm1024: Add MODULE_LICENSE("GPL") Module bt869: Add s-video out and DVD resolution support Module fscscy: implement min/max for voltages and fans diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg index d65359d1..5ade3811 100644 --- a/etc/sensors.conf.eg +++ b/etc/sensors.conf.eg @@ -280,10 +280,10 @@ chip "lm78-*" "lm78-j-*" "lm79-*" "w83781d-*" set in3_max 5.0 * 1.05 set in4_min 12 * 0.95 set in4_max 12 * 1.05 - set in5_min -12 * 0.95 - set in5_max -12 * 1.05 - set in6_min -5 * 0.95 - set in6_max -5 * 1.05 + set in5_max -12 * 0.95 + set in5_min -12 * 1.05 + set in6_max -5 * 0.95 + set in6_min -5 * 1.05 # examples for lm78, lm78j, lm79 temperature limits; # set temp_over 40 @@ -518,10 +518,10 @@ chip "as99127f-*" set in3_max 5.0 * 1.05 set in4_min 12 * 0.90 set in4_max 12 * 1.10 - set in5_min -12 * 0.90 - set in5_max -12 * 1.10 - set in6_min -5 * 0.95 - set in6_max -5 * 1.05 + set in5_max -12 * 0.90 + set in5_min -12 * 1.10 + set in6_max -5 * 0.95 + set in6_min -5 * 1.05 # examples for temperature limits # set temp1_over 40 diff --git a/lib/chips.c b/lib/chips.c index 1c9fb2b6..3f4264e2 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -64,10 +64,11 @@ static sensors_chip_feature lm78_features[] = SENSORS_MODE_RW, LM78_SYSCTL_IN3, VALUE(1), 2 }, { SENSORS_LM78_IN4_MIN, "in4_min", SENSORS_LM78_IN4, SENSORS_LM78_IN4, SENSORS_MODE_RW, LM78_SYSCTL_IN4, VALUE(1), 2 }, +/* swap 5 and 6 min/max because compute lines will be inverting */ { SENSORS_LM78_IN5_MIN, "in5_min", SENSORS_LM78_IN5, SENSORS_LM78_IN5, - SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(1), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(2), 2 }, { SENSORS_LM78_IN6_MIN, "in6_min", SENSORS_LM78_IN6, SENSORS_LM78_IN6, - SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(1), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(2), 2 }, { SENSORS_LM78_IN0_MAX, "in0_max", SENSORS_LM78_IN0, SENSORS_LM78_IN0, SENSORS_MODE_RW, LM78_SYSCTL_IN0, VALUE(2), 2 }, { SENSORS_LM78_IN1_MAX, "in1_max", SENSORS_LM78_IN1, SENSORS_LM78_IN1, @@ -79,9 +80,9 @@ static sensors_chip_feature lm78_features[] = { SENSORS_LM78_IN4_MAX, "in4_max", SENSORS_LM78_IN4, SENSORS_LM78_IN4, SENSORS_MODE_RW, LM78_SYSCTL_IN4, VALUE(2), 2 }, { SENSORS_LM78_IN5_MAX, "in5_max", SENSORS_LM78_IN5, SENSORS_LM78_IN5, - SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(2), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(1), 2 }, { SENSORS_LM78_IN6_MAX, "in6_max", SENSORS_LM78_IN6, SENSORS_LM78_IN6, - SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(2), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(1), 2 }, { SENSORS_LM78_FAN1, "fan1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, SENSORS_MODE_R, LM78_SYSCTL_FAN1, VALUE(2), 0 }, { SENSORS_LM78_FAN2, "fan2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, @@ -144,10 +145,11 @@ static sensors_chip_feature lm78j_features[] = SENSORS_MODE_RW, LM78_SYSCTL_IN3, VALUE(1), 2 }, { SENSORS_LM78J_IN4_MIN, "in4_min", SENSORS_LM78J_IN4, SENSORS_LM78J_IN4, SENSORS_MODE_RW, LM78_SYSCTL_IN4, VALUE(1), 2 }, +/* swap 5 and 6 min/max because compute lines will be inverting */ { SENSORS_LM78J_IN5_MIN, "in5_min", SENSORS_LM78J_IN5, SENSORS_LM78J_IN5, - SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(1), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(2), 2 }, { SENSORS_LM78J_IN6_MIN, "in6_min", SENSORS_LM78J_IN6, SENSORS_LM78J_IN6, - SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(1), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(2), 2 }, { SENSORS_LM78J_IN0_MAX, "in0_max", SENSORS_LM78J_IN0, SENSORS_LM78J_IN0, SENSORS_MODE_RW, LM78_SYSCTL_IN0, VALUE(2), 2 }, { SENSORS_LM78J_IN1_MAX, "in1_max", SENSORS_LM78J_IN1, SENSORS_LM78J_IN1, @@ -159,9 +161,9 @@ static sensors_chip_feature lm78j_features[] = { SENSORS_LM78J_IN4_MAX, "in4_max", SENSORS_LM78J_IN4, SENSORS_LM78J_IN4, SENSORS_MODE_RW, LM78_SYSCTL_IN4, VALUE(2), 2 }, { SENSORS_LM78J_IN5_MAX, "in5_max", SENSORS_LM78J_IN5, SENSORS_LM78J_IN5, - SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(2), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(1), 2 }, { SENSORS_LM78J_IN6_MAX, "in6_max", SENSORS_LM78J_IN6, SENSORS_LM78J_IN6, - SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(2), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(1), 2 }, { SENSORS_LM78J_FAN1, "fan1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, SENSORS_MODE_R, LM78_SYSCTL_FAN1, VALUE(2), 0 }, { SENSORS_LM78J_FAN2, "fan2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, @@ -227,10 +229,11 @@ static sensors_chip_feature lm79_features[] = SENSORS_MODE_RW, LM78_SYSCTL_IN3, VALUE(1), 2 }, { SENSORS_LM79_IN4_MIN, "in4_min", SENSORS_LM79_IN4, SENSORS_LM79_IN4, SENSORS_MODE_RW, LM78_SYSCTL_IN4, VALUE(1), 2 }, +/* swap 5 and 6 min/max because compute lines will be inverting */ { SENSORS_LM79_IN5_MIN, "in5_min", SENSORS_LM79_IN5, SENSORS_LM79_IN5, - SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(1), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(2), 2 }, { SENSORS_LM79_IN6_MIN, "in6_min", SENSORS_LM79_IN6, SENSORS_LM79_IN6, - SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(1), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(2), 2 }, { SENSORS_LM79_IN0_MAX, "in0_max", SENSORS_LM79_IN0, SENSORS_LM79_IN0, SENSORS_MODE_RW, LM78_SYSCTL_IN0, VALUE(2), 2 }, { SENSORS_LM79_IN1_MAX, "in1_max", SENSORS_LM79_IN1, SENSORS_LM79_IN1, @@ -242,9 +245,9 @@ static sensors_chip_feature lm79_features[] = { SENSORS_LM79_IN4_MAX, "in4_max", SENSORS_LM79_IN4, SENSORS_LM79_IN4, SENSORS_MODE_RW, LM78_SYSCTL_IN4, VALUE(2), 2 }, { SENSORS_LM79_IN5_MAX, "in5_max", SENSORS_LM79_IN5, SENSORS_LM79_IN5, - SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(2), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN5, VALUE(1), 2 }, { SENSORS_LM79_IN6_MAX, "in6_max", SENSORS_LM79_IN6, SENSORS_LM79_IN6, - SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(2), 2 }, + SENSORS_MODE_RW, LM78_SYSCTL_IN6, VALUE(1), 2 }, { SENSORS_LM79_FAN1, "fan1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, SENSORS_MODE_R, LM78_SYSCTL_FAN1, VALUE(2), 0 }, { SENSORS_LM79_FAN2, "fan2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, @@ -668,12 +671,13 @@ static sensors_chip_feature w83781d_features[] = { SENSORS_W83781D_IN4_MIN, "in4_min", SENSORS_W83781D_IN4, SENSORS_W83781D_IN4, SENSORS_MODE_RW, W83781D_SYSCTL_IN4, VALUE(1), 2 }, +/* swap 5 and 6 min/max because compute lines will be inverting */ { SENSORS_W83781D_IN5_MIN, "in5_min", SENSORS_W83781D_IN5, SENSORS_W83781D_IN5, SENSORS_MODE_RW, - W83781D_SYSCTL_IN5, VALUE(1), 2 }, + W83781D_SYSCTL_IN5, VALUE(2), 2 }, { SENSORS_W83781D_IN6_MIN, "in6_min", SENSORS_W83781D_IN6, SENSORS_W83781D_IN6, SENSORS_MODE_RW, - W83781D_SYSCTL_IN6, VALUE(1), 2 }, + W83781D_SYSCTL_IN6, VALUE(2), 2 }, { SENSORS_W83781D_IN0_MAX, "in0_max", SENSORS_W83781D_IN0, SENSORS_W83781D_IN0, SENSORS_MODE_RW, W83781D_SYSCTL_IN0, VALUE(2), 2 }, @@ -691,10 +695,10 @@ static sensors_chip_feature w83781d_features[] = W83781D_SYSCTL_IN4, VALUE(2), 2 }, { SENSORS_W83781D_IN5_MAX, "in5_max", SENSORS_W83781D_IN5, SENSORS_W83781D_IN5, SENSORS_MODE_RW, - W83781D_SYSCTL_IN5, VALUE(2), 2 }, + W83781D_SYSCTL_IN5, VALUE(1), 2 }, { SENSORS_W83781D_IN6_MAX, "in6_max", SENSORS_W83781D_IN6, SENSORS_W83781D_IN6, SENSORS_MODE_RW, - W83781D_SYSCTL_IN6, VALUE(2), 2 }, + W83781D_SYSCTL_IN6, VALUE(1), 2 }, { SENSORS_W83781D_FAN1, "fan1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, SENSORS_MODE_R, W83781D_SYSCTL_FAN1, VALUE(2), 0 }, { SENSORS_W83781D_FAN2, "fan2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, @@ -757,6 +761,149 @@ static sensors_chip_feature w83781d_features[] = { 0 } }; +static sensors_chip_feature as99127f_features[] = + { + { SENSORS_W83782D_IN0, "in0", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_IN0, VALUE(3), 2 }, + { SENSORS_W83782D_IN1, "in1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_IN1, VALUE(3), 2 }, + { SENSORS_W83782D_IN2, "in2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_IN2, VALUE(3), 2 }, + { SENSORS_W83782D_IN3, "in3", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_IN3, VALUE(3), 2 }, + { SENSORS_W83782D_IN4, "in4", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_IN4, VALUE(3), 2 }, + { SENSORS_W83782D_IN5, "in5", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_IN5, VALUE(3), 2 }, + { SENSORS_W83782D_IN6, "in6", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_IN6, VALUE(3), 2 }, + { SENSORS_W83782D_IN7, "in7", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_IN7, VALUE(3), 2 }, + { SENSORS_W83782D_IN8, "in8", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_IN8, VALUE(3), 2 }, + { SENSORS_W83782D_IN0_MIN, "in0_min", SENSORS_W83782D_IN0, + SENSORS_W83782D_IN0, SENSORS_MODE_RW, + W83781D_SYSCTL_IN0, VALUE(1), 2 }, + { SENSORS_W83782D_IN1_MIN, "in1_min", SENSORS_W83782D_IN1, + SENSORS_W83782D_IN1, SENSORS_MODE_RW, + W83781D_SYSCTL_IN1, VALUE(1), 2 }, + { SENSORS_W83782D_IN2_MIN, "in2_min", SENSORS_W83782D_IN2, + SENSORS_W83782D_IN2, SENSORS_MODE_RW, + W83781D_SYSCTL_IN2, VALUE(1), 2 }, + { SENSORS_W83782D_IN3_MIN, "in3_min", SENSORS_W83782D_IN3, + SENSORS_W83782D_IN3, SENSORS_MODE_RW, + W83781D_SYSCTL_IN3, VALUE(1), 2 }, + { SENSORS_W83782D_IN4_MIN, "in4_min", SENSORS_W83782D_IN4, + SENSORS_W83782D_IN4, SENSORS_MODE_RW, + W83781D_SYSCTL_IN4, VALUE(1), 2 }, +/* swap 5 and 6 min/max because compute lines will be inverting */ + { SENSORS_W83782D_IN5_MIN, "in5_min", SENSORS_W83782D_IN5, + SENSORS_W83782D_IN5, SENSORS_MODE_RW, + W83781D_SYSCTL_IN5, VALUE(2), 2 }, + { SENSORS_W83782D_IN6_MIN, "in6_min", SENSORS_W83782D_IN6, + SENSORS_W83782D_IN6, SENSORS_MODE_RW, + W83781D_SYSCTL_IN6, VALUE(2), 2 }, + { SENSORS_W83782D_IN7_MIN, "in7_min", SENSORS_W83782D_IN7, + SENSORS_W83782D_IN7, SENSORS_MODE_RW, + W83781D_SYSCTL_IN7, VALUE(1), 2 }, + { SENSORS_W83782D_IN8_MIN, "in8_min", SENSORS_W83782D_IN8, + SENSORS_W83782D_IN8, SENSORS_MODE_RW, + W83781D_SYSCTL_IN8, VALUE(1), 2 }, + { SENSORS_W83782D_IN0_MAX, "in0_max", SENSORS_W83782D_IN0, + SENSORS_W83782D_IN0, SENSORS_MODE_RW, + W83781D_SYSCTL_IN0, VALUE(2), 2 }, + { SENSORS_W83782D_IN1_MAX, "in1_max", SENSORS_W83782D_IN1, + SENSORS_W83782D_IN1, SENSORS_MODE_RW, + W83781D_SYSCTL_IN1, VALUE(2), 2 }, + { SENSORS_W83782D_IN2_MAX, "in2_max", SENSORS_W83782D_IN2, + SENSORS_W83782D_IN2, SENSORS_MODE_RW, + W83781D_SYSCTL_IN2, VALUE(2), 2 }, + { SENSORS_W83782D_IN3_MAX, "in3_max", SENSORS_W83782D_IN3, + SENSORS_W83782D_IN3, SENSORS_MODE_RW, + W83781D_SYSCTL_IN3, VALUE(2), 2 }, + { SENSORS_W83782D_IN4_MAX, "in4_max", SENSORS_W83782D_IN4, + SENSORS_W83782D_IN4, SENSORS_MODE_RW, + W83781D_SYSCTL_IN4, VALUE(2), 2 }, + { SENSORS_W83782D_IN5_MAX, "in5_max", SENSORS_W83782D_IN5, + SENSORS_W83782D_IN5, SENSORS_MODE_RW, + W83781D_SYSCTL_IN5, VALUE(1), 2 }, + { SENSORS_W83782D_IN6_MAX, "in6_max", SENSORS_W83782D_IN6, + SENSORS_W83782D_IN6, SENSORS_MODE_RW, + W83781D_SYSCTL_IN6, VALUE(1), 2 }, + { SENSORS_W83782D_IN7_MAX, "in7_max", SENSORS_W83782D_IN7, + SENSORS_W83782D_IN7, SENSORS_MODE_RW, + W83781D_SYSCTL_IN7, VALUE(2), 2 }, + { SENSORS_W83782D_IN8_MAX, "in8_max", SENSORS_W83782D_IN8, + SENSORS_W83782D_IN8, SENSORS_MODE_RW, + W83781D_SYSCTL_IN8, VALUE(2), 2 }, + { SENSORS_W83782D_FAN1, "fan1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_FAN1, VALUE(2), 0 }, + { SENSORS_W83782D_FAN2, "fan2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_FAN2, VALUE(2), 0 }, + { SENSORS_W83781D_FAN3, "fan3", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_FAN3, VALUE(2), 0 }, + { SENSORS_W83782D_FAN1_MIN, "fan1_min", SENSORS_W83782D_FAN1, + SENSORS_W83782D_FAN1, SENSORS_MODE_RW, + W83781D_SYSCTL_FAN1, VALUE(1), 0 }, + { SENSORS_W83782D_FAN2_MIN, "fan2_min", SENSORS_W83782D_FAN2, + SENSORS_W83782D_FAN2, SENSORS_MODE_RW, + W83781D_SYSCTL_FAN2, VALUE(1), 0 }, + { SENSORS_W83781D_FAN3_MIN, "fan3_min", SENSORS_W83781D_FAN3, + SENSORS_W83782D_FAN3, SENSORS_MODE_RW, + W83781D_SYSCTL_FAN3, VALUE(1), 0 }, + { SENSORS_W83782D_TEMP1, "temp1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_TEMP1, VALUE(3), 1 }, + { SENSORS_W83782D_TEMP1_HYST, "temp1_hyst", SENSORS_W83782D_TEMP1, + SENSORS_W83782D_TEMP1, SENSORS_MODE_RW, + W83781D_SYSCTL_TEMP1, VALUE(2), 1 }, + { SENSORS_W83782D_TEMP1_OVER, "temp1_over", SENSORS_W83782D_TEMP1, + SENSORS_W83782D_TEMP1, SENSORS_MODE_RW, + W83781D_SYSCTL_TEMP1, VALUE(1), 1 }, + { SENSORS_W83782D_TEMP2, "temp2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_TEMP2, VALUE(3), 1 }, + { SENSORS_W83782D_TEMP2_HYST, "temp2_hyst", SENSORS_W83782D_TEMP2, + SENSORS_W83782D_TEMP2, SENSORS_MODE_RW, + W83781D_SYSCTL_TEMP2, VALUE(2), 1 }, + { SENSORS_W83782D_TEMP2_OVER, "temp2_over", SENSORS_W83782D_TEMP2, + SENSORS_W83782D_TEMP2, SENSORS_MODE_RW, + W83781D_SYSCTL_TEMP2, VALUE(1), 1 }, + { SENSORS_W83782D_TEMP3, "temp3", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_TEMP3, VALUE(3), 1 }, + { SENSORS_W83782D_TEMP3_HYST, "temp3_hyst", SENSORS_W83782D_TEMP3, + SENSORS_W83782D_TEMP3, SENSORS_MODE_RW, + W83781D_SYSCTL_TEMP3, VALUE(2), 1 }, + { SENSORS_W83782D_TEMP3_OVER, "temp3_over", SENSORS_W83782D_TEMP3, + SENSORS_W83782D_TEMP3, SENSORS_MODE_RW, + W83781D_SYSCTL_TEMP3, VALUE(1), 1 }, + + { SENSORS_W83782D_VID, "vid", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_VID, VALUE(1), 2 }, + { SENSORS_W83782D_FAN1_DIV, "fan1_div", SENSORS_W83782D_FAN1, + SENSORS_NO_MAPPING, SENSORS_MODE_RW, + W83781D_SYSCTL_FAN_DIV, VALUE(1), 0 }, + { SENSORS_W83782D_FAN2_DIV, "fan2_div", SENSORS_W83782D_FAN2, + SENSORS_NO_MAPPING, SENSORS_MODE_RW, + W83781D_SYSCTL_FAN_DIV, VALUE(2), 0 }, + { SENSORS_W83782D_FAN3_DIV, "fan3_div", SENSORS_W83781D_FAN3, + SENSORS_NO_MAPPING, SENSORS_MODE_R, + W83781D_SYSCTL_FAN_DIV, VALUE(3), 0 }, + { SENSORS_W83782D_ALARMS, "alarms", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_R, W83781D_SYSCTL_ALARMS, VALUE(1), 0 }, + { SENSORS_W83782D_BEEP_ENABLE, "beep_enable", SENSORS_W83782D_ALARMS, + SENSORS_NO_MAPPING, SENSORS_MODE_RW, + W83781D_SYSCTL_BEEP, VALUE(1), 0 }, + { SENSORS_W83782D_BEEPS, "beeps", SENSORS_W83782D_ALARMS, + SENSORS_W83782D_ALARMS, SENSORS_MODE_RW, + W83781D_SYSCTL_BEEP, VALUE(2), 0 }, + { SENSORS_W83782D_SENS1, "sensor1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_RW, W83781D_SYSCTL_SENS1, VALUE(1), 0 }, + { SENSORS_W83782D_SENS2, "sensor2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_RW, W83781D_SYSCTL_SENS2, VALUE(1), 0 }, + { SENSORS_W83782D_SENS3, "sensor3", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, + SENSORS_MODE_RW, W83781D_SYSCTL_SENS3, VALUE(1), 0 }, + { 0 } + }; + static sensors_chip_feature w83782d_features[] = { { SENSORS_W83782D_IN0, "in0", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING, @@ -2488,8 +2635,7 @@ sensors_chip_features sensors_chip_features_list[] = { SENSORS_W83697HF_PREFIX, w83782d_features }, /* same as 782d */ /* Cheat on 83627HF for now - no separate #defines */ { SENSORS_W83627HF_PREFIX, w83782d_features }, - /* Cheat on 991627HF for now - no separate #defines */ - { SENSORS_AS99127F_PREFIX, w83782d_features }, + { SENSORS_AS99127F_PREFIX, as99127f_features }, { SENSORS_ADM9240_PREFIX, adm9240_features }, /* Cheat on LM81 for now - no separate #defines */ { SENSORS_LM81_PREFIX, adm9240_features },