wt/lm-sensors
1
0 Fork 0
mirror of https://github.com/lm-sensors/lm-sensors.git synced 2026-10-17 10:59:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo earlier temp. magnitude workarounds for w83781d vs. kernel 2.6.

Browse Source 
The workarounds were obviated by Khali's patch which was merged
	into Linus' tree at 2.6.1-bk6.  Tested here on w83781d - would
	appreciate testing on the other w83's...


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2237 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Mark M. Hoffman committed 2004-01-21 03:42:07 +00:00
1 parent 77dc6f86c3
commit 144d461b27
1 file changed
+33 -45
Download Patch File Download Diff File Expand all files Collapse all files
lib/chips.c
+33 -45
View File
@@ -814,33 +814,30 @@ static sensors_chip_feature w83781d_features[] =
{ SENSORS_W83781D_FAN3_MIN, "fan3_min", SENSORS_W83781D_FAN3,
SENSORS_W83781D_FAN3, RW,
W83781D_SYSCTL_FAN3, VALUE(1), 0 },
/* as of -test9, w83781d driver has a mag of 2, not the standard 3;
the two additional values can be removed after the driver is fixed,
because getsysname() in proc.c will handle */
{ SENSORS_W83781D_TEMP1, "temp1", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP1, VALUE(3), 1, "temp_input1", 2 },
R, W83781D_SYSCTL_TEMP1, VALUE(3), 1 },
{ SENSORS_W83781D_TEMP1_HYST, "temp1_hyst", SENSORS_W83781D_TEMP1,
SENSORS_W83781D_TEMP1, RW,
W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_hyst1", 2 },
W83781D_SYSCTL_TEMP1, VALUE(2), 1 },
{ SENSORS_W83781D_TEMP1_OVER, "temp1_over", SENSORS_W83781D_TEMP1,
SENSORS_W83781D_TEMP1, RW,
W83781D_SYSCTL_TEMP1, VALUE(1), 1, "temp_max1", 2 },
W83781D_SYSCTL_TEMP1, VALUE(1), 1 },
{ SENSORS_W83781D_TEMP2, "temp2", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP2, VALUE(3), 1, "temp_input2", 2 },
R, W83781D_SYSCTL_TEMP2, VALUE(3), 1 },
{ SENSORS_W83781D_TEMP2_HYST, "temp2_hyst", SENSORS_W83781D_TEMP2,
SENSORS_W83781D_TEMP2, RW,
W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_hyst2", 2 },
W83781D_SYSCTL_TEMP2, VALUE(2), 1 },
{ SENSORS_W83781D_TEMP2_OVER, "temp2_over", SENSORS_W83781D_TEMP2,
SENSORS_W83781D_TEMP2, RW,
W83781D_SYSCTL_TEMP2, VALUE(1), 1, "temp_max2", 2 },
W83781D_SYSCTL_TEMP2, VALUE(1), 1 },
{ SENSORS_W83781D_TEMP3, "temp3", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP3, VALUE(3), 1, "temp_input3", 2 },
R, W83781D_SYSCTL_TEMP3, VALUE(3), 1 },
{ SENSORS_W83781D_TEMP3_HYST, "temp3_hyst", SENSORS_W83781D_TEMP3,
SENSORS_W83781D_TEMP3, RW,
W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_hyst3", 2 },
W83781D_SYSCTL_TEMP3, VALUE(2), 1 },
{ SENSORS_W83781D_TEMP3_OVER, "temp3_over", SENSORS_W83781D_TEMP3,
SENSORS_W83781D_TEMP3, RW,
W83781D_SYSCTL_TEMP3, VALUE(1), 1, "temp_max3", 2 },
W83781D_SYSCTL_TEMP3, VALUE(1), 1 },
{ SENSORS_W83781D_VID, "vid", NOMAP, NOMAP,
R, W83781D_SYSCTL_VID, VALUE(1), 3 },
{ SENSORS_W83781D_VRM, "vrm", NOMAP, NOMAP,
@@ -955,33 +952,30 @@ static sensors_chip_feature as99127f_features[] =
{ SENSORS_W83781D_FAN3_MIN, "fan3_min", SENSORS_W83781D_FAN3,
SENSORS_W83782D_FAN3, RW,
W83781D_SYSCTL_FAN3, VALUE(1), 0 },
/* as of -test9, w83781d driver has a mag of 2, not the standard 3;
the two additional values can be removed after the driver is fixed,
because getsysname() in proc.c will handle */
{ SENSORS_W83782D_TEMP1, "temp1", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP1, VALUE(3), 1, "temp_input1", 2 },
R, W83781D_SYSCTL_TEMP1, VALUE(3), 1 },
{ SENSORS_W83782D_TEMP1_HYST, "temp1_hyst", SENSORS_W83782D_TEMP1,
SENSORS_W83782D_TEMP1, RW,
W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_hyst1", 2 },
W83781D_SYSCTL_TEMP1, VALUE(2), 1 },
{ SENSORS_W83782D_TEMP1_OVER, "temp1_over", SENSORS_W83782D_TEMP1,
SENSORS_W83782D_TEMP1, RW,
W83781D_SYSCTL_TEMP1, VALUE(1), 1, "temp_max1", 2 },
W83781D_SYSCTL_TEMP1, VALUE(1), 1 },
{ SENSORS_W83782D_TEMP2, "temp2", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP2, VALUE(3), 1, "temp_input2", 2 },
R, W83781D_SYSCTL_TEMP2, VALUE(3), 1 },
{ SENSORS_W83782D_TEMP2_HYST, "temp2_hyst", SENSORS_W83782D_TEMP2,
SENSORS_W83782D_TEMP2, RW,
W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_hyst2", 2 },
W83781D_SYSCTL_TEMP2, VALUE(2), 1 },
{ SENSORS_W83782D_TEMP2_OVER, "temp2_over", SENSORS_W83782D_TEMP2,
SENSORS_W83782D_TEMP2, RW,
W83781D_SYSCTL_TEMP2, VALUE(1), 1, "temp_max2", 2 },
W83781D_SYSCTL_TEMP2, VALUE(1), 1 },
{ SENSORS_W83782D_TEMP3, "temp3", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP3, VALUE(3), 1, "temp_input3", 2 },
R, W83781D_SYSCTL_TEMP3, VALUE(3), 1 },
{ SENSORS_W83782D_TEMP3_HYST, "temp3_hyst", SENSORS_W83782D_TEMP3,
SENSORS_W83782D_TEMP3, RW,
W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_hyst3", 2 },
W83781D_SYSCTL_TEMP3, VALUE(2), 1 },
{ SENSORS_W83782D_TEMP3_OVER, "temp3_over", SENSORS_W83782D_TEMP3,
SENSORS_W83782D_TEMP3, RW,
W83781D_SYSCTL_TEMP3, VALUE(1), 1, "temp_max3", 2 },
W83781D_SYSCTL_TEMP3, VALUE(1), 1 },
{ SENSORS_W83782D_VID, "vid", NOMAP, NOMAP,
R, W83781D_SYSCTL_VID, VALUE(1), 3 },
{ SENSORS_W83782D_VRM, "vrm", NOMAP, NOMAP,
@@ -1164,33 +1158,30 @@ static sensors_chip_feature w83782d_features[] =
{ SENSORS_W83781D_FAN3_MIN, "fan3_min", SENSORS_W83781D_FAN3,
SENSORS_W83782D_FAN3, RW,
W83781D_SYSCTL_FAN3, VALUE(1), 0 },
/* as of -test9, w83781d driver has a mag of 2, not the standard 3;
the two additional values can be removed after the driver is fixed,
because getsysname() in proc.c will handle */
{ SENSORS_W83782D_TEMP1, "temp1", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP1, VALUE(3), 1, "temp_input1", 2 },
R, W83781D_SYSCTL_TEMP1, VALUE(3), 1 },
{ SENSORS_W83782D_TEMP1_HYST, "temp1_hyst", SENSORS_W83782D_TEMP1,
SENSORS_W83782D_TEMP1, RW,
W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_hyst1", 2 },
W83781D_SYSCTL_TEMP1, VALUE(2), 1 },
{ SENSORS_W83782D_TEMP1_OVER, "temp1_over", SENSORS_W83782D_TEMP1,
SENSORS_W83782D_TEMP1, RW,
W83781D_SYSCTL_TEMP1, VALUE(1), 1, "temp_max1", 2 },
W83781D_SYSCTL_TEMP1, VALUE(1), 1 },
{ SENSORS_W83782D_TEMP2, "temp2", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP2, VALUE(3), 1, "temp_input2", 2 },
R, W83781D_SYSCTL_TEMP2, VALUE(3), 1 },
{ SENSORS_W83782D_TEMP2_HYST, "temp2_hyst", SENSORS_W83782D_TEMP2,
SENSORS_W83782D_TEMP2, RW,
W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_hyst2", 2 },
W83781D_SYSCTL_TEMP2, VALUE(2), 1 },
{ SENSORS_W83782D_TEMP2_OVER, "temp2_over", SENSORS_W83782D_TEMP2,
SENSORS_W83782D_TEMP2, RW,
W83781D_SYSCTL_TEMP2, VALUE(1), 1, "temp_max2", 2 },
W83781D_SYSCTL_TEMP2, VALUE(1), 1 },
{ SENSORS_W83782D_TEMP3, "temp3", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP3, VALUE(3), 1, "temp_input3", 2 },
R, W83781D_SYSCTL_TEMP3, VALUE(3), 1 },
{ SENSORS_W83782D_TEMP3_HYST, "temp3_hyst", SENSORS_W83782D_TEMP3,
SENSORS_W83782D_TEMP3, RW,
W83781D_SYSCTL_TEMP3, VALUE(2), 1, "temp_hyst3", 2 },
W83781D_SYSCTL_TEMP3, VALUE(2), 1 },
{ SENSORS_W83782D_TEMP3_OVER, "temp3_over", SENSORS_W83782D_TEMP3,
SENSORS_W83782D_TEMP3, RW,
W83781D_SYSCTL_TEMP3, VALUE(1), 1, "temp_max3", 2 },
W83781D_SYSCTL_TEMP3, VALUE(1), 1 },
{ SENSORS_W83782D_VID, "vid", NOMAP, NOMAP,
R, W83781D_SYSCTL_VID, VALUE(1), 3 },
{ SENSORS_W83782D_VRM, "vrm", NOMAP, NOMAP,
@@ -1294,25 +1285,22 @@ static sensors_chip_feature w83783s_features[] =
{ SENSORS_W83783S_FAN3_MIN, "fan3_min", SENSORS_W83783S_FAN3,
SENSORS_W83783S_FAN3, RW,
W83781D_SYSCTL_FAN3, VALUE(1), 0 },
/* as of -test9, w83781d driver has a mag of 2, not the standard 3;
the two additional values can be removed after the driver is fixed,
because getsysname() in proc.c will handle */
{ SENSORS_W83782D_TEMP1, "temp1", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP1, VALUE(3), 1, "temp_input1", 2 },
R, W83781D_SYSCTL_TEMP1, VALUE(3), 1 },
{ SENSORS_W83782D_TEMP1_HYST, "temp1_hyst", SENSORS_W83782D_TEMP1,
SENSORS_W83782D_TEMP1, RW,
W83781D_SYSCTL_TEMP1, VALUE(2), 1, "temp_hyst1", 2 },
W83781D_SYSCTL_TEMP1, VALUE(2), 1 },
{ SENSORS_W83782D_TEMP1_OVER, "temp1_over", SENSORS_W83782D_TEMP1,
SENSORS_W83782D_TEMP1, RW,
W83781D_SYSCTL_TEMP1, VALUE(1), 1, "temp_max1", 2 },
W83781D_SYSCTL_TEMP1, VALUE(1), 1 },
{ SENSORS_W83782D_TEMP2, "temp2", NOMAP, NOMAP,
R, W83781D_SYSCTL_TEMP2, VALUE(3), 1, "temp_input2", 2 },
R, W83781D_SYSCTL_TEMP2, VALUE(3), 1 },
{ SENSORS_W83782D_TEMP2_HYST, "temp2_hyst", SENSORS_W83782D_TEMP2,
SENSORS_W83782D_TEMP2, RW,
W83781D_SYSCTL_TEMP2, VALUE(2), 1, "temp_hyst2", 2 },
W83781D_SYSCTL_TEMP2, VALUE(2), 1 },
{ SENSORS_W83782D_TEMP2_OVER, "temp2_over", SENSORS_W83782D_TEMP2,
SENSORS_W83782D_TEMP2, RW,
W83781D_SYSCTL_TEMP2, VALUE(1), 1, "temp_max2", 2 },
W83781D_SYSCTL_TEMP2, VALUE(1), 1 },
{ SENSORS_W83783S_VID, "vid", NOMAP, NOMAP,
R, W83781D_SYSCTL_VID, VALUE(1), 3 },
{ SENSORS_W83783S_VRM, "vrm", NOMAP, NOMAP,