From 705eeb900f6441020cc301dc46ce855f80cccea6 Mon Sep 17 00:00:00 2001 From: "Mark D. Studebaker" Date: Sat, 28 Feb 2004 16:24:01 +0000 Subject: [PATCH] remove in6 and temp1 from vt1211 and vt8231 git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2318 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 2 ++ etc/sensors.conf.eg | 10 ---------- lib/chips.c | 34 ++-------------------------------- 3 files changed, 4 insertions(+), 42 deletions(-) diff --git a/CHANGES b/CHANGES index 17b5f6c6..86f78c26 100644 --- a/CHANGES +++ b/CHANGES @@ -31,6 +31,7 @@ ask CVS about it: Fix PWM in w83627thf Preserve other bits when forcing temp2/3 to comparator mode Module w83781d: Preserve other bits when forcing temp2/3 to comparator mode + Remove asb100 support Modules asb100.c, fscher.c, lm90.c, max6650.c, w83l785ts.c: Define driver ID if i2c-id.h doesn't have it yet. Modules i2c-ali1535.c, i2c-hydra.c, i2c-i801.c, i2c-sis5595.c: @@ -46,6 +47,7 @@ ask CVS about it: Fix vt1211 and vt8231 uch_config not being writable Add 2.6 lm80 support Add w83637hf support + Remove in6 and temp1 from vt1211 and vt8231 2.8.4 (20040207) diff --git a/etc/sensors.conf.eg b/etc/sensors.conf.eg index ca9f1987..017d39ab 100644 --- a/etc/sensors.conf.eg +++ b/etc/sensors.conf.eg @@ -1717,8 +1717,6 @@ chip "vt1211-*" "vt8231-*" # # set uch1-2 to temp mode, uch3-5 to voltage mode # - ignore temp1 - ignore in6 set config 12 ignore in0 ignore in1 @@ -1739,9 +1737,7 @@ chip "vt1211-*" "vt8231-*" label in3 "+5V" label in4 "+12V" label in5 "+3.3V" -# label in6 "VCore2" -# label temp1 "1211 Temp" label temp2 "MB1 Temp" label temp3 "Proc Temp" label temp4 "MB2 Temp" @@ -1766,7 +1762,6 @@ chip "vt1211-*" "vt8231-*" compute in3 ((@ * 100) - 3) / (0.4167 * 95.8), (@ * 0.4167 * 0.958) + .03 compute in4 ((@ * 100) - 3) / (0.1754 * 95.8), (@ * 0.1754 * 0.958) + .03 compute in5 ((@ * 100) - 3) / (0.6296 * 95.8), (@ * 0.6296 * 0.958) + .03 -# compute in6 ((@ * 100) - 3) / (0.5952 * 95.8), (@ * 0.5952 * 0.958) + .03 set vrm 9.1 # set in0_min 2.5 * 0.95 @@ -1781,10 +1776,7 @@ chip "vt1211-*" "vt8231-*" set in4_max 12.0 * 1.10 set in5_min 3.3 * 0.95 set in5_max 3.3 * 1.05 -# set in6_min 2.0 * 0.97 -# set in6_max 2.0 * 1.03 -# compute temp1 (@ - 65) / 0.9686, (@ * 0.9686) + 65 compute temp3 (@ - 65) / 0.9686, (@ * 0.9686) + 65 # # thermistor calculations. @@ -1805,8 +1797,6 @@ chip "vt1211-*" "vt8231-*" compute temp7 (1 / (((1 / 3435) * (` ((253 - @) / (@ - 43)))) + (1 / 298.15))) - 273.15, \ 253 - (210 / (1 + (1 / (^ (((3435 * (25 - @)) / ((@ + 273.15) * 298.15))))))) -# set temp1_hyst 40 -# set temp1_over 45 set temp2_hyst 40 set temp2_over 45 set temp3_hyst 60 diff --git a/lib/chips.c b/lib/chips.c index 2bbcb7a0..7a21f00d 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -4115,8 +4115,6 @@ static sensors_chip_feature vt1211_features[] = R, VT1211_SYSCTL_IN4, VALUE(3), 2 }, { SENSORS_VT1211_IN5, "in5", NOMAP, NOMAP, R, VT1211_SYSCTL_IN5, VALUE(3), 2 }, - { SENSORS_VT1211_IN6, "in6", NOMAP, NOMAP, - R, VT1211_SYSCTL_IN6, VALUE(3), 2 }, { SENSORS_VT1211_IN0_MIN, "in0_min", SENSORS_VT1211_IN0, SENSORS_VT1211_IN0, RW, VT1211_SYSCTL_IN0, VALUE(1), 2 }, @@ -4135,9 +4133,6 @@ static sensors_chip_feature vt1211_features[] = { SENSORS_VT1211_IN5_MIN, "in5_min", SENSORS_VT1211_IN5, SENSORS_VT1211_IN5, RW, VT1211_SYSCTL_IN5, VALUE(1), 2 }, - { SENSORS_VT1211_IN6_MIN, "in6_min", SENSORS_VT1211_IN6, - SENSORS_VT1211_IN6, - RW, VT1211_SYSCTL_IN6, VALUE(1), 2 }, { SENSORS_VT1211_IN0_MAX, "in0_max", SENSORS_VT1211_IN0, SENSORS_VT1211_IN0, RW, VT1211_SYSCTL_IN0, VALUE(2), 2 }, @@ -4156,9 +4151,6 @@ static sensors_chip_feature vt1211_features[] = { SENSORS_VT1211_IN5_MAX, "in5_max", SENSORS_VT1211_IN5, SENSORS_VT1211_IN5, RW, VT1211_SYSCTL_IN5, VALUE(2), 2 }, - { SENSORS_VT1211_IN6_MAX, "in6_max", SENSORS_VT1211_IN6, - SENSORS_VT1211_IN6, - RW, VT1211_SYSCTL_IN6, VALUE(2), 2 }, { SENSORS_VT1211_FAN1, "fan1", NOMAP, NOMAP, R, VT1211_SYSCTL_FAN1, VALUE(2), 0 }, { SENSORS_VT1211_FAN2, "fan2", NOMAP, NOMAP, @@ -4169,14 +4161,7 @@ static sensors_chip_feature vt1211_features[] = { SENSORS_VT1211_FAN2_MIN, "fan2_min", SENSORS_VT1211_FAN2, SENSORS_VT1211_FAN2, RW, VT1211_SYSCTL_FAN2, VALUE(1), 0 }, - { SENSORS_VT1211_TEMP, "temp1", NOMAP, NOMAP, - R, VT1211_SYSCTL_TEMP, VALUE(3), 1 }, - { SENSORS_VT1211_TEMP_HYST, "temp1_hyst", SENSORS_VT1211_TEMP, - SENSORS_VT1211_TEMP, RW, - VT1211_SYSCTL_TEMP, VALUE(2), 1 }, - { SENSORS_VT1211_TEMP_OVER, "temp1_over", SENSORS_VT1211_TEMP, - SENSORS_VT1211_TEMP, RW, - VT1211_SYSCTL_TEMP, VALUE(1), 1 }, + /* no temp1 */ { SENSORS_VT1211_TEMP2, "temp2", NOMAP, NOMAP, R, VT1211_SYSCTL_TEMP2, VALUE(3), 1 }, { SENSORS_VT1211_TEMP2_HYST, "temp2_hyst", SENSORS_VT1211_TEMP2, @@ -4300,8 +4285,6 @@ static sensors_chip_feature vt8231_features[] = R, VT8231_SYSCTL_IN4, VALUE(3), 2 }, { SENSORS_VT8231_IN5, "in5", NOMAP, NOMAP, R, VT8231_SYSCTL_IN5, VALUE(3), 2 }, - { SENSORS_VT8231_IN6, "in6", NOMAP, NOMAP, - R, VT8231_SYSCTL_IN6, VALUE(3), 2 }, { SENSORS_VT8231_IN0_MIN, "in0_min", SENSORS_VT8231_IN0, SENSORS_VT8231_IN0, RW, VT8231_SYSCTL_IN0, VALUE(1), 2 }, @@ -4320,9 +4303,6 @@ static sensors_chip_feature vt8231_features[] = { SENSORS_VT8231_IN5_MIN, "in5_min", SENSORS_VT8231_IN5, SENSORS_VT8231_IN5, RW, VT8231_SYSCTL_IN5, VALUE(1), 2 }, - { SENSORS_VT8231_IN6_MIN, "in6_min", SENSORS_VT8231_IN6, - SENSORS_VT8231_IN6, - RW, VT8231_SYSCTL_IN6, VALUE(1), 2 }, { SENSORS_VT8231_IN0_MAX, "in0_max", SENSORS_VT8231_IN0, SENSORS_VT8231_IN0, RW, VT8231_SYSCTL_IN0, VALUE(2), 2 }, @@ -4341,9 +4321,6 @@ static sensors_chip_feature vt8231_features[] = { SENSORS_VT8231_IN5_MAX, "in5_max", SENSORS_VT8231_IN5, SENSORS_VT8231_IN5, RW, VT8231_SYSCTL_IN5, VALUE(2), 2 }, - { SENSORS_VT8231_IN6_MAX, "in6_max", SENSORS_VT8231_IN6, - SENSORS_VT8231_IN6, - RW, VT8231_SYSCTL_IN6, VALUE(2), 2 }, { SENSORS_VT8231_FAN1, "fan1", NOMAP, NOMAP, R, VT8231_SYSCTL_FAN1, VALUE(2), 0 }, { SENSORS_VT8231_FAN2, "fan2", NOMAP, NOMAP, @@ -4354,14 +4331,7 @@ static sensors_chip_feature vt8231_features[] = { SENSORS_VT8231_FAN2_MIN, "fan2_min", SENSORS_VT8231_FAN2, SENSORS_VT8231_FAN2, RW, VT8231_SYSCTL_FAN2, VALUE(1), 0 }, - { SENSORS_VT8231_TEMP, "temp1", NOMAP, NOMAP, - R, VT8231_SYSCTL_TEMP, VALUE(3), 1 }, - { SENSORS_VT8231_TEMP_HYST, "temp1_hyst", SENSORS_VT8231_TEMP, - SENSORS_VT8231_TEMP, RW, - VT8231_SYSCTL_TEMP, VALUE(2), 1 }, - { SENSORS_VT8231_TEMP_OVER, "temp1_over", SENSORS_VT8231_TEMP, - SENSORS_VT8231_TEMP, RW, - VT8231_SYSCTL_TEMP, VALUE(1), 1 }, + /* no temp1 */ { SENSORS_VT8231_TEMP2, "temp2", NOMAP, NOMAP, R, VT8231_SYSCTL_TEMP2, VALUE(3), 1 }, { SENSORS_VT8231_TEMP2_HYST, "temp2_hyst", SENSORS_VT8231_TEMP2,