Changeset 4747

Timestamp:

09/04/07 16:38:30 (1 year ago)

Author:

khali

Message:

libsensors: Fix adm1024 support for Linux 2.6.
The driver doesn't exist yet, but at least now the library is ready.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/lib/chips.c (modified) (3 diffs)

lm-sensors/trunk/CHANGES

@@ -8 +8 @@
-           Fix bmcsensors support for Linux 2.6
-           Fix lm93 VID support for Linux 2.6
+           Fix adm1024 support for Linux 2.6
-  Makefile: Fix kernel version detection (#2187)
-  Module fscher: Add missing read of control register (2.6 backport)

lm-sensors/trunk/lib/chips.c

@@ -2247 +2247 @@
-  { 
-    { { SENSORS_ADM1024_IN0, "2.5V", NOMAP, NOMAP, R }, 
-
+, "in0_input", 3
-    { { SENSORS_ADM1024_IN1, "Vccp1", NOMAP, NOMAP, R }, 
-
+, "in1_input", 3
-    { { SENSORS_ADM1024_IN2, "3.3V", NOMAP, NOMAP, R }, 
-
+, "in2_input", 3
-    { { SENSORS_ADM1024_IN3, "5V", NOMAP, NOMAP, R }, 
-
+, "in3_input", 3
-    { { SENSORS_ADM1024_IN4, "12V", NOMAP, NOMAP, R }, 
-
+, "in4_input", 3
-    { { SENSORS_ADM1024_IN5, "Vccp2", NOMAP, NOMAP, R }, 
-
+, "in5_input", 3
-    { { SENSORS_ADM1024_IN0_MIN, "2.5V_min", SENSORS_ADM1024_IN0, 
-                                 SENSORS_ADM1024_IN0, RW }, 
-
+, "in0_min", 3
-    { { SENSORS_ADM1024_IN1_MIN, "Vccp1_min", SENSORS_ADM1024_IN1, 
-                                 SENSORS_ADM1024_IN1, RW }, 
-
+, "in1_min", 3
-    { { SENSORS_ADM1024_IN2_MIN, "3.3V_min", SENSORS_ADM1024_IN2, 
-                                 SENSORS_ADM1024_IN2, RW }, 
-
+, "in2_min", 3
-    { { SENSORS_ADM1024_IN3_MIN, "5V_min", SENSORS_ADM1024_IN3, 
-                                 SENSORS_ADM1024_IN3, RW }, 
-
+, "in3_min", 3
-    { { SENSORS_ADM1024_IN4_MIN, "12V_min", SENSORS_ADM1024_IN4, 
-                                 SENSORS_ADM1024_IN4, RW }, 
-
+, "in4_min", 3
-    { { SENSORS_ADM1024_IN5_MIN, "Vccp2_min", SENSORS_ADM1024_IN5, 
-                                 SENSORS_ADM1024_IN5, RW }, 
-
+, "in5_min", 3
-    { { SENSORS_ADM1024_IN0_MAX, "2.5V_max", SENSORS_ADM1024_IN0, 
-                                 SENSORS_ADM1024_IN0, RW }, 
-
+, "in0_max", 3
-    { { SENSORS_ADM1024_IN1_MAX, "Vccp1_max", SENSORS_ADM1024_IN1, 
-                                 SENSORS_ADM1024_IN1, RW }, 
-
+, "in1_max", 3
-    { { SENSORS_ADM1024_IN2_MAX, "3.3V_max", SENSORS_ADM1024_IN2, 
-                                 SENSORS_ADM1024_IN2, RW }, 
-
+, "in2_max", 3
-    { { SENSORS_ADM1024_IN3_MAX, "5V_max", SENSORS_ADM1024_IN3, 
-                                 SENSORS_ADM1024_IN3, RW }, 
-
+, "in3_max", 3
-    { { SENSORS_ADM1024_IN4_MAX, "12V_max", SENSORS_ADM1024_IN4, 
-                                 SENSORS_ADM1024_IN4, RW }, 
-
+, "in4_max", 3
-    { { SENSORS_ADM1024_IN5_MAX, "Vccp2_max", SENSORS_ADM1024_IN5, 
-                                 SENSORS_ADM1024_IN5, RW }, 
-
+, "in5_max", 3
-    { { SENSORS_ADM1024_FAN1, "fan1", NOMAP, NOMAP, R }, 
-                              ADM1024_SYSCTL_FAN1, VALUE(2), 0 },
@@ -2307 +2307 @@
-                              ADM1024_SYSCTL_TEMP, VALUE(3), 1 },
-    { { SENSORS_ADM1024_TEMP1, "temp1", NOMAP, NOMAP, R }, 
-
+, "temp2_input", 3
-    { { SENSORS_ADM1024_TEMP2, "temp2", NOMAP, NOMAP, R }, 
-
+, "temp3_input", 3
-    { { SENSORS_ADM1024_TEMP_HYST, "temp_hyst", SENSORS_ADM1024_TEMP, 
-                                   SENSORS_ADM1024_TEMP, RW }, 
@@ -2318 +2318 @@
-    { { SENSORS_ADM1024_TEMP1_HYST, "temp1_hyst", SENSORS_ADM1024_TEMP1, 
-                                    SENSORS_ADM1024_TEMP1, RW }, 
-
+, "temp2_max_hyst", 3
-    { { SENSORS_ADM1024_TEMP1_OVER, "temp1_over", SENSORS_ADM1024_TEMP1, 
-                                    SENSORS_ADM1024_TEMP1, RW }, 
-
+, "temp2_max", 3
-    { { SENSORS_ADM1024_TEMP2_HYST, "temp2_hyst", SENSORS_ADM1024_TEMP2, 
-                                    SENSORS_ADM1024_TEMP2, RW }, 
-
+, "temp3_max_hyst", 3
-    { { SENSORS_ADM1024_TEMP2_OVER, "temp2_over", SENSORS_ADM1024_TEMP2, 
-                                    SENSORS_ADM1024_TEMP2, RW }, 
-
-
+
-    { { SENSORS_ADM1024_VID, "vid", NOMAP, NOMAP, R }, 
-                             ADM1024_SYSCTL_VID, VALUE(1), 2 },