Skip to contentSkip to conversation

libsensors (chips.c, chips.h) update for 2.6.X lm85 fan

PATCH New Justin Thiessen 2 participants 2 messages May 19, 2005 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libsensors (chips.c, chips.h) update for 2.6.X lm85 fan

Hi,

Here is a patch for lm_sensors/lib/chips.h and lm_sensors/lib/chips.c to update the lm85 entries and keep them in step with the patch for lm85 fan control in the 2.6.X lm85 driver.

Again, feedback appreciated.

Sincerely,

Justin Thiessen
------------------------------
[email protected]
http://www.penguincomputing.com

===============================

lib/chips.c +120 -122
diff -U 2 -r lm_sensors2/lib/chips.c lm_sensors2_lm85-changes/lib/chips.c
@@ -3272,31 +3272,31 @@
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG3, VALUE(1), 1 },
-    { SENSORS_LM85_PWM1_MIN, "pwm1_min", SENSORS_LM85_PWM1, 
+    { SENSORS_LM85_PWM1_AUTO_PWM_MIN, "pwm1_auto_pwm_min", SENSORS_LM85_PWM1, 
                          NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG1, VALUE(2), 1 },
-    { SENSORS_LM85_PWM2_MIN, "pwm2_min", SENSORS_LM85_PWM2, 
+                         LM85_SYSCTL_PWM_CFG1, VALUE(2), 0 },
+    { SENSORS_LM85_PWM2_AUTO_PWM_MIN, "pwm2_auto_pwm_min", SENSORS_LM85_PWM2, 
                          NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG2, VALUE(2), 1 },
-    { SENSORS_LM85_PWM3_MIN, "pwm3_min", SENSORS_LM85_PWM3, 
+                         LM85_SYSCTL_PWM_CFG2, VALUE(2), 0 },
+    { SENSORS_LM85_PWM3_AUTO_PWM_MIN, "pwm3_auto_pwm_min", SENSORS_LM85_PWM3, 
                          NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG3, VALUE(2), 1 },
-    { SENSORS_LM85_PWM1_FREQ, "pwm1_freq", SENSORS_LM85_PWM1, 
+                         LM85_SYSCTL_PWM_CFG3, VALUE(2), 0 },
+    { SENSORS_LM85_PWM1_AUTO_PWM_FREQ, "pwm1_auto_pwm_freq", SENSORS_LM85_PWM1, 
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG1, VALUE(3), 1 },
-    { SENSORS_LM85_PWM2_FREQ, "pwm2_freq", SENSORS_LM85_PWM2, 
+    { SENSORS_LM85_PWM2_AUTO_PWM_FREQ, "pwm2_auto_pwm_freq", SENSORS_LM85_PWM2, 
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG2, VALUE(3), 1 },
-    { SENSORS_LM85_PWM3_FREQ, "pwm3_freq", SENSORS_LM85_PWM3, 
+    { SENSORS_LM85_PWM3_AUTO_PWM_FREQ, "pwm3_auto_pwm_freq", SENSORS_LM85_PWM3, 
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG3, VALUE(3), 1 },
-    { SENSORS_LM85_PWM1_MIN_CTL, "pwm1_min_ctl", SENSORS_LM85_PWM1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG1, VALUE(4), 1 },
-    { SENSORS_LM85_PWM2_MIN_CTL, "pwm2_min_ctl", SENSORS_LM85_PWM2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG2, VALUE(4), 1 },
-    { SENSORS_LM85_PWM3_MIN_CTL, "pwm3_min_ctl", SENSORS_LM85_PWM3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG3, VALUE(4), 1 },
+    { SENSORS_LM85_PWM1_AUTO_PWM_MINCTL, "pwm1_auto_pwm_minctl",
+                         SENSORS_LM85_PWM1, NOMAP, RW, 
+                         LM85_SYSCTL_PWM_CFG1, VALUE(4), 0 },
+    { SENSORS_LM85_PWM2_AUTO_PWM_MINCTL, "pwm2_auto_pwm_minctl",
+                         SENSORS_LM85_PWM2, NOMAP, RW, 
+                         LM85_SYSCTL_PWM_CFG2, VALUE(4), 0 },
+    { SENSORS_LM85_PWM3_AUTO_PWM_MINCTL, "pwm3_auto_pwm_minctl",
+                         SENSORS_LM85_PWM3, NOMAP, RW, 
+                         LM85_SYSCTL_PWM_CFG3, VALUE(4), 0 },
     { SENSORS_LM85_PWM1_INVERT, "pwm1_invert", SENSORS_LM85_PWM1, 
                          NOMAP, RW, 
@@ -3308,50 +3308,49 @@
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG3, VALUE(5), 0 },
-    { SENSORS_LM85_PWM1_ZONE, "pwm1_zone", SENSORS_LM85_PWM1, 
-                         NOMAP, RW, 
+    { SENSORS_LM85_PWM1_AUTO_CHANNELS, "pwm1_auto_channels",
+                         SENSORS_LM85_PWM1, NOMAP, RW, 
                          LM85_SYSCTL_PWM_ZONE1, VALUE(1), 0 },
-    { SENSORS_LM85_PWM2_ZONE, "pwm2_zone", SENSORS_LM85_PWM2, 
-                         NOMAP, RW, 
+    { SENSORS_LM85_PWM2_AUTO_CHANNELS, "pwm2_auto_channels",
+                         SENSORS_LM85_PWM2, NOMAP, RW, 
                          LM85_SYSCTL_PWM_ZONE2, VALUE(1), 0 },
-    { SENSORS_LM85_PWM3_ZONE, "pwm3_zone", SENSORS_LM85_PWM3, 
-                         NOMAP, RW, 
+    { SENSORS_LM85_PWM3_AUTO_CHANNELS, "pwm3_auto_channels",
+                         SENSORS_LM85_PWM3, NOMAP, RW, 
                          LM85_SYSCTL_PWM_ZONE3, VALUE(1), 0 },
-    { SENSORS_LM85_ZONE1_LIMIT, "zone1_limit", SENSORS_LM85_TEMP1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE1, VALUE(1), 1 },
-    { SENSORS_LM85_ZONE2_LIMIT, "zone2_limit", SENSORS_LM85_TEMP2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE2, VALUE(1), 1 },
-    { SENSORS_LM85_ZONE3_LIMIT, "zone3_limit", SENSORS_LM85_TEMP3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE3, VALUE(1), 1 },
-    { SENSORS_LM85_ZONE1_HYST, "zone1_hyst", SENSORS_LM85_TEMP1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE1, VALUE(2), 1 },
-    { SENSORS_LM85_ZONE2_HYST, "zone2_hyst", SENSORS_LM85_TEMP2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE2, VALUE(2), 1 },
-    { SENSORS_LM85_ZONE3_HYST, "zone3_hyst", SENSORS_LM85_TEMP3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE3, VALUE(2), 1 },
-    { SENSORS_LM85_ZONE1_RANGE, "zone1_range", SENSORS_LM85_TEMP1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE1, VALUE(3), 1 },
-    { SENSORS_LM85_ZONE2_RANGE, "zone2_range", SENSORS_LM85_TEMP2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE2, VALUE(3), 1 },
-    { SENSORS_LM85_ZONE3_RANGE, "zone3_range", SENSORS_LM85_TEMP3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE3, VALUE(3), 1 },
-    { SENSORS_LM85_ZONE1_CRITICAL, "zone1_critical", SENSORS_LM85_TEMP1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE1, VALUE(4), 1 },
-    { SENSORS_LM85_ZONE2_CRITICAL, "zone2_critical", SENSORS_LM85_TEMP2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE2, VALUE(4), 1 },
-    { SENSORS_LM85_ZONE3_CRITICAL, "zone3_critical", SENSORS_LM85_TEMP3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE3, VALUE(4), 1 },
-
+    { SENSORS_LM85_TEMP1_AUTO_TEMP_MIN, "temp1_auto_temp_min",
+                         SENSORS_LM85_TEMP1, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE1, VALUE(1), 3 },
+    { SENSORS_LM85_TEMP2_AUTO_TEMP_MIN, "temp2_auto_temp_min",
+                         SENSORS_LM85_TEMP2, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE2, VALUE(1), 3 },
+    { SENSORS_LM85_TEMP3_AUTO_TEMP_MIN, "temp3_auto_temp_min",
+                         SENSORS_LM85_TEMP3, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE3, VALUE(1), 3 },
+    { SENSORS_LM85_TEMP1_AUTO_TEMP_OFF, "temp1_auto_temp_off",
+                         SENSORS_LM85_TEMP1, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE1, VALUE(2), 3 },
+    { SENSORS_LM85_TEMP2_AUTO_TEMP_OFF, "temp2_auto_temp_off",
+                         SENSORS_LM85_TEMP2, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE2, VALUE(2), 3 },
+    { SENSORS_LM85_TEMP3_AUTO_TEMP_OFF, "temp3_auto_temp_off",
+                         SENSORS_LM85_TEMP3, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE3, VALUE(2), 3 },
+    { SENSORS_LM85_TEMP1_AUTO_TEMP_MAX, "temp1_auto_temp_max",
+                         SENSORS_LM85_TEMP1, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE1, VALUE(3), 3 },
+    { SENSORS_LM85_TEMP2_AUTO_TEMP_MAX, "temp2_auto_temp_max",
+                         SENSORS_LM85_TEMP2, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE2, VALUE(3), 3 },
+    { SENSORS_LM85_TEMP3_AUTO_TEMP_MAX, "temp3_auto_temp_max",
+                         SENSORS_LM85_TEMP3, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE3, VALUE(3), 3 },
+    { SENSORS_LM85_TEMP1_AUTO_TEMP_CRIT, "temp1_auto_temp_crit",
+                         SENSORS_LM85_TEMP1, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE1, VALUE(4), 3 },
+    { SENSORS_LM85_TEMP2_AUTO_TEMP_CRIT, "temp2_auto_temp_crit",
+                         SENSORS_LM85_TEMP2, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE2, VALUE(4), 3 },
+    { SENSORS_LM85_TEMP3_AUTO_TEMP_CRIT, "temp3_auto_temp_crit",
+                         SENSORS_LM85_TEMP3, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE3, VALUE(4), 3 },
     { SENSORS_LM85_PWM1_SPINUP_CTL, "pwm1_spinup_ctl", SENSORS_LM85_PWM1, 
                          NOMAP, RW, 
@@ -3372,11 +3371,11 @@
                          NOMAP, RW, 
                          LM85_SYSCTL_TACH_MODE, VALUE(3), 0 },
-    { SENSORS_LM85_ZONE1_SMOOTH, "zone1_smooth", SENSORS_LM85_TEMP1, 
+    { SENSORS_LM85_TEMP1_AUTO_TEMP_SMOOTH, "zone1_smooth", SENSORS_LM85_TEMP1, 
                          NOMAP, RW, 
                          LM85_SYSCTL_SMOOTH1, VALUE(1), 1 },
-    { SENSORS_LM85_ZONE2_SMOOTH, "zone2_smooth", SENSORS_LM85_TEMP2, 
+    { SENSORS_LM85_TEMP2_AUTO_TEMP_SMOOTH, "zone2_smooth", SENSORS_LM85_TEMP2, 
                          NOMAP, RW, 
                          LM85_SYSCTL_SMOOTH2, VALUE(1), 1 },
-    { SENSORS_LM85_ZONE3_SMOOTH, "zone3_smooth", SENSORS_LM85_TEMP3, 
+    { SENSORS_LM85_TEMP3_AUTO_TEMP_SMOOTH, "zone3_smooth", SENSORS_LM85_TEMP3, 
                          NOMAP, RW, 
                          LM85_SYSCTL_SMOOTH3, VALUE(1), 1 },
@@ -3478,31 +3477,31 @@
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG3, VALUE(1), 1 },
-    { SENSORS_LM85_PWM1_MIN, "pwm1_min", SENSORS_LM85_PWM1, 
+    { SENSORS_LM85_PWM1_AUTO_PWM_MIN, "pwm1_auto_pwm_min", SENSORS_LM85_PWM1, 
                          NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG1, VALUE(2), 1 },
-    { SENSORS_LM85_PWM2_MIN, "pwm2_min", SENSORS_LM85_PWM2, 
+                         LM85_SYSCTL_PWM_CFG1, VALUE(2), 0 },
+    { SENSORS_LM85_PWM2_AUTO_PWM_MIN, "pwm2_auto_pwm_min", SENSORS_LM85_PWM2, 
                          NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG2, VALUE(2), 1 },
-    { SENSORS_LM85_PWM3_MIN, "pwm3_min", SENSORS_LM85_PWM3, 
+                         LM85_SYSCTL_PWM_CFG2, VALUE(2), 0 },
+    { SENSORS_LM85_PWM3_AUTO_PWM_MIN, "pwm3_auto_pwm_min", SENSORS_LM85_PWM3, 
                          NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG3, VALUE(2), 1 },
-    { SENSORS_LM85_PWM1_FREQ, "pwm1_freq", SENSORS_LM85_PWM1, 
+                         LM85_SYSCTL_PWM_CFG3, VALUE(2), 0 },
+    { SENSORS_LM85_PWM1_AUTO_PWM_FREQ, "pwm1_auto_pwm_freq", SENSORS_LM85_PWM1, 
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG1, VALUE(3), 1 },
-    { SENSORS_LM85_PWM2_FREQ, "pwm2_freq", SENSORS_LM85_PWM2, 
+    { SENSORS_LM85_PWM2_AUTO_PWM_FREQ, "pwm2_auto_pwm_freq", SENSORS_LM85_PWM2, 
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG2, VALUE(3), 1 },
-    { SENSORS_LM85_PWM3_FREQ, "pwm3_freq", SENSORS_LM85_PWM3, 
+    { SENSORS_LM85_PWM3_AUTO_PWM_FREQ, "pwm3_auto_pwm_freq", SENSORS_LM85_PWM3, 
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG3, VALUE(3), 1 },
-    { SENSORS_LM85_PWM1_MIN_CTL, "pwm1_min_ctl", SENSORS_LM85_PWM1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG1, VALUE(4), 1 },
-    { SENSORS_LM85_PWM2_MIN_CTL, "pwm2_min_ctl", SENSORS_LM85_PWM2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG2, VALUE(4), 1 },
-    { SENSORS_LM85_PWM3_MIN_CTL, "pwm3_min_ctl", SENSORS_LM85_PWM3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_PWM_CFG3, VALUE(4), 1 },
+    { SENSORS_LM85_PWM1_AUTO_PWM_MINCTL, "pwm1_auto_pwm_minctl",
+                         SENSORS_LM85_PWM1, NOMAP, RW, 
+                         LM85_SYSCTL_PWM_CFG1, VALUE(4), 0 },
+    { SENSORS_LM85_PWM2_AUTO_PWM_MINCTL, "pwm2_auto_pwm_minctl",
+                         SENSORS_LM85_PWM2, NOMAP, RW, 
+                         LM85_SYSCTL_PWM_CFG2, VALUE(4), 0 },
+    { SENSORS_LM85_PWM3_AUTO_PWM_MINCTL, "pwm3_auto_pwm_minctl",
+                         SENSORS_LM85_PWM3, NOMAP, RW, 
+                         LM85_SYSCTL_PWM_CFG3, VALUE(4), 0 },
     { SENSORS_LM85_PWM1_INVERT, "pwm1_invert", SENSORS_LM85_PWM1, 
                          NOMAP, RW, 
@@ -3514,50 +3513,49 @@
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_CFG3, VALUE(5), 0 },
-    { SENSORS_LM85_PWM1_ZONE, "pwm1_zone", SENSORS_LM85_PWM1, 
+    { SENSORS_LM85_PWM1_AUTO_CHANNELS, "pwm1_auto_channels", SENSORS_LM85_PWM1, 
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_ZONE1, VALUE(1), 0 },
-    { SENSORS_LM85_PWM2_ZONE, "pwm2_zone", SENSORS_LM85_PWM2, 
+    { SENSORS_LM85_PWM2_AUTO_CHANNELS, "pwm2_auto_channels", SENSORS_LM85_PWM2, 
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_ZONE2, VALUE(1), 0 },
-    { SENSORS_LM85_PWM3_ZONE, "pwm3_zone", SENSORS_LM85_PWM3, 
+    { SENSORS_LM85_PWM3_AUTO_CHANNELS, "pwm3_auto_channels", SENSORS_LM85_PWM3, 
                          NOMAP, RW, 
                          LM85_SYSCTL_PWM_ZONE3, VALUE(1), 0 },
-    { SENSORS_LM85_ZONE1_LIMIT, "zone1_limit", SENSORS_LM85_TEMP1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE1, VALUE(1), 1 },
-    { SENSORS_LM85_ZONE2_LIMIT, "zone2_limit", SENSORS_LM85_TEMP2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE2, VALUE(1), 1 },
-    { SENSORS_LM85_ZONE3_LIMIT, "zone3_limit", SENSORS_LM85_TEMP3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE3, VALUE(1), 1 },
-    { SENSORS_LM85_ZONE1_HYST, "zone1_hyst", SENSORS_LM85_TEMP1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE1, VALUE(2), 1 },
-    { SENSORS_LM85_ZONE2_HYST, "zone2_hyst", SENSORS_LM85_TEMP2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE2, VALUE(2), 1 },
-    { SENSORS_LM85_ZONE3_HYST, "zone3_hyst", SENSORS_LM85_TEMP3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE3, VALUE(2), 1 },
-    { SENSORS_LM85_ZONE1_RANGE, "zone1_range", SENSORS_LM85_TEMP1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE1, VALUE(3), 1 },
-    { SENSORS_LM85_ZONE2_RANGE, "zone2_range", SENSORS_LM85_TEMP2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE2, VALUE(3), 1 },
-    { SENSORS_LM85_ZONE3_RANGE, "zone3_range", SENSORS_LM85_TEMP3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE3, VALUE(3), 1 },
-    { SENSORS_LM85_ZONE1_CRITICAL, "zone1_critical", SENSORS_LM85_TEMP1, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE1, VALUE(4), 1 },
-    { SENSORS_LM85_ZONE2_CRITICAL, "zone2_critical", SENSORS_LM85_TEMP2, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE2, VALUE(4), 1 },
-    { SENSORS_LM85_ZONE3_CRITICAL, "zone3_critical", SENSORS_LM85_TEMP3, 
-                         NOMAP, RW, 
-                         LM85_SYSCTL_ZONE3, VALUE(4), 1 },
-
+    { SENSORS_LM85_TEMP1_AUTO_TEMP_MIN, "temp1_auto_temp_min",
+                         SENSORS_LM85_TEMP1, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE1, VALUE(1), 3 },
+    { SENSORS_LM85_TEMP2_AUTO_TEMP_MIN, "temp2_auto_temp_min",
+                         SENSORS_LM85_TEMP2, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE2, VALUE(1), 3 },
+    { SENSORS_LM85_TEMP3_AUTO_TEMP_MIN, "temp3_auto_temp_min",
+                         SENSORS_LM85_TEMP3, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE3, VALUE(1), 3 },
+    { SENSORS_LM85_TEMP1_AUTO_TEMP_OFF, "temp1_auto_temp_off",
+                         SENSORS_LM85_TEMP1, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE1, VALUE(2), 3 },
+    { SENSORS_LM85_TEMP2_AUTO_TEMP_OFF, "temp2_auto_temp_off",
+                         SENSORS_LM85_TEMP2, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE2, VALUE(2), 3 },
+    { SENSORS_LM85_TEMP3_AUTO_TEMP_OFF, "temp3_auto_temp_off",
+                         SENSORS_LM85_TEMP3, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE3, VALUE(2), 3 },
+    { SENSORS_LM85_TEMP1_AUTO_TEMP_MAX, "temp1_auto_temp_max",
+                         SENSORS_LM85_TEMP1, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE1, VALUE(3), 3 },
+    { SENSORS_LM85_TEMP2_AUTO_TEMP_MAX, "temp2_auto_temp_max",
+                         SENSORS_LM85_TEMP2, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE2, VALUE(3), 3 },
+    { SENSORS_LM85_TEMP3_AUTO_TEMP_MAX, "temp3_auto_temp_max",
+                         SENSORS_LM85_TEMP3, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE3, VALUE(3), 3 },
+    { SENSORS_LM85_TEMP1_AUTO_TEMP_CRIT, "temp1_auto_temp_crit",
+                         SENSORS_LM85_TEMP1, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE1, VALUE(4), 3 },
+    { SENSORS_LM85_TEMP2_AUTO_TEMP_CRIT, "temp2_auto_temp_crit",
+                         SENSORS_LM85_TEMP2, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE2, VALUE(4), 3 },
+    { SENSORS_LM85_TEMP3_AUTO_TEMP_CRIT, "temp3_auto_temp_crit",
+                         SENSORS_LM85_TEMP3, NOMAP, RW, 
+                         LM85_SYSCTL_ZONE3, VALUE(4), 3 },
     { SENSORS_ADM1027_FAN1_TACH_MODE, "fan1_tach_mode", SENSORS_LM85_FAN1, 
                          NOMAP, RW, 
lib/chips.h +101 -101

206 lines not on this page · raw message

#1 lore raw

PATCH 1/1 libsensors (chips.c, chips.h) update for 2.6.X lm85 fan

Hi Justin,

Sorry for the delay...

Quoted 5 lines

Here is a patch for lm_sensors/lib/chips.h and lm_sensors/lib/chips.c to update the lm85 entries and keep them in step with the patch for lm85 fan control in the 2.6.X lm85 driver.

Again, feedback appreciated.

Hm, now that your kernel patch is in 2.6, I guess we want to apply this?

I don't think that the patch is quite correct though.

First, I think that your changes break the compatibility with the 2.4 driver. You have to extend, not replace, the existing entries. See the head of chips.c for hints, or other driver entries in the same file.

Second, I'd prefer a path to chips.h which doesn't realign things. I understand you did if for the beauty of it all, but it makes my reviewing work harder. This isn't a problem if all values aren't exactly aligned.

Thanks.

Jean