Changeset 4331

Timestamp:

02/23/07 15:33:32 (2 years ago)

Author:

khali

Message:

Add support for the SMSC LPC47M292 fans.

Files:

• lm-sensors/trunk/CHANGES (modified) (2 diffs)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/smsc47m1 (modified) (2 diffs)
• lm-sensors/trunk/kernel/chips/smsc47m1.c (modified) (22 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (2 diffs)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (2 diffs)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -6 +6 @@
-            physical device. This change is required to survive the
-            planned struct class_dev removal from future 2.6 kernels.
+           Add support for the SMSC LPC47M292 fans (prefix smsc47m2)
-  Man page i2cdetect.8: Scanning range can be restricted
-  Module bmcsensors: Fix debugging messages
@@ -15 +16 @@
-  Module i2c-piix4: Add ATI SB600 support (2.6 backport)
-  Module i2c-viapro: Add CX700 support (2.6 backport)
+  Module smsc47m1: Add SMSC LPC47M292 support
-  Programs i2cdetect, i2cdump, isadump: Flush output in real time
+  Program sensors: Add smsc47m2 support (fans)
-  Program sensors-detect: Only probe relevant I2C addresses
-                          Drop ARP-capable device detection

lm-sensors/trunk/doc/chips/SUMMARY

@@ -221 +221 @@
-        smsc47m192      -       -       2       2       no      yes (LPC)
-        smsc47m997      -       -       2       2       no      yes (LPC)
+        (reported as a "smsc47m2")
+        smsc47m292      -       -       3       3       no      yes (LPC)
-
-thmc50

lm-sensors/trunk/doc/chips/smsc47m1

@@ -17 +17 @@
-        http://www.smsc.com/main/tools/discontinued/47m15x.pdf
-        http://www.smsc.com/main/datasheets/47m192.pdf
+  * SMSC LPC47M292
+    Prefix: 'smsc47m2'
+    Addresses scanned: none, address read from Super I/O config space
+    Datasheet: Not public
-  * SMSC LPC47M997
-    Addresses scanned: none, address read from Super I/O config space
@@ -42 +46 @@
-contain monitoring and PWM control circuitry for two fans.
-
-47M15x and 47M192 chips contain a full 'hardware monitoring block'
-
-
+LPC47M15x, LPC47M192 and LPC47M292 chips contain a full 'hardware
+
+hardware monitoring 
-
-No documentation is available for the 47M997, but it has the same device

lm-sensors/trunk/kernel/chips/smsc47m1.c

@@ -39 +39 @@
-static unsigned int normal_isa_range[] = { SENSORS_ISA_END };
-
-
+
+
-
-/* modified from kernel/include/traps.c */
@@ -88 +89 @@
- * The LPC47M997 is undocumented, but seems to be compatible with
- * the LPC47M192, and has the same device id.
+ * The LPC47M292 (device id 0x6B) is somewhat compatible, but it
+ * supports a 3rd fan, and the pin configuration registers are
+ * unfortunately different.
- */
-
+
+
+
-
-#define SMSC_ACT_REG 0x30
@@ -100 +106 @@
-#define SMSC47M1_REG_TPIN1 0x34
-#define SMSC47M1_REG_PPIN(nr) (0x37 - (nr))
-#define SMSC47M1_REG_PWM(nr) (0x55 + (nr))
-#define SMSC47M1_REG_FANDIV 0x58
-
-
+
+
+
+
+
+
+
+
+
+
-
-static inline u8 MIN_TO_REG(long rpm, int div)
@@ -128 +141 @@
-        struct semaphore lock;
-        int sysctl_id;
+        enum chips type;
-
-        struct semaphore update_lock;
@@ -133 +147 @@
-        unsigned long last_updated;     /* In jiffies */
-
-2
-2
-2
+3
+3
+3
-        u8 alarms;              /* Register encoding */
-2
+3
-};
-
@@ -173 +187 @@
-#define SMSC47M1_SYSCTL_FAN1 1101   /* Rotations/min */
-#define SMSC47M1_SYSCTL_FAN2 1102
+#define SMSC47M1_SYSCTL_FAN3 1103
-#define SMSC47M1_SYSCTL_PWM1 1401
-#define SMSC47M1_SYSCTL_PWM2 1402
+#define SMSC47M1_SYSCTL_PWM3 1403
-#define SMSC47M1_SYSCTL_FAN_DIV 2000        /* 1, 2, 4 or 8 */
-#define SMSC47M1_SYSCTL_ALARMS 2004    /* bitvector */
@@ -180 +196 @@
-#define SMSC47M1_ALARM_FAN1 0x0001
-#define SMSC47M1_ALARM_FAN2 0x0002
+#define SMSC47M1_ALARM_FAN3 0x0004
-
-/* -- SENSORS SYSCTL END -- */
@@ -199 +216 @@
-};
-
+static ctl_table smsc47m2_dir_table_template[] = {
+        {SMSC47M1_SYSCTL_FAN1, "fan1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &smsc47m1_fan},
+        {SMSC47M1_SYSCTL_FAN2, "fan2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &smsc47m1_fan},
+        {SMSC47M1_SYSCTL_FAN3, "fan3", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &smsc47m1_fan},
+        {SMSC47M1_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &smsc47m1_fan_div},
+        {SMSC47M1_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &smsc47m1_alarms},
+        {SMSC47M1_SYSCTL_PWM1, "pwm1", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &smsc47m1_pwm},
+        {SMSC47M1_SYSCTL_PWM2, "pwm2", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &smsc47m1_pwm},
+        {SMSC47M1_SYSCTL_PWM3, "pwm3", NULL, 0, 0644, NULL, &i2c_proc_real,
+         &i2c_sysctl_real, NULL, &smsc47m1_pwm},
+        {0}
+};
+
-static int smsc47m1_attach_adapter(struct i2c_adapter *adapter)
-{
@@ -209 +246 @@
-
-        superio_enter();
-val
-val
+devid 
+devid
-                superio_exit();
-                return -ENODEV;
@@ -238 +275 @@
-        struct smsc47m1_data *data;
-        int err = 0;
- = "smsc47m1"
- = "47M1xx chip"
+
+
-
-        if (!i2c_is_isa_adapter(adapter)) {
@@ -264 +301 @@
-        }
-
+        switch (devid) {
+        case 0x51:
+                kind = smsc47m1;
+                type_name = "smsc47m1";
+                client_name = "LPC47B27x chip";
+                break;
+        case 0x5F:
+                kind = smsc47m1;
+                type_name = "smsc47m1";
+                client_name = "LPC47M14x chip";
+                break;
+        case 0x60:
+                kind = smsc47m1;
+                type_name = "smsc47m1";
+                client_name = "LPC47M192 chip";
+                break;
+        case 0x6B:
+                kind = smsc47m2;
+                type_name = "smsc47m2";
+                client_name = "LPC47M292 chip";
+                break;
+        default:
+                kind = smsc47m1;
+                type_name = "smsc47m1";
+                client_name = "LPC47M1xx chip";
+        }
+
-        new_client = &data->client;
-        new_client->addr = address;
@@ -274 +338 @@
-        request_region(address, SMSC_EXTENT, "smsc47m1-fans");
-        strcpy(new_client->name, client_name);
+        data->type = kind;
-        data->valid = 0;
-        init_MUTEX(&data->update_lock);
@@ -282 +347 @@
-        if ((i = i2c_register_entry((struct i2c_client *) new_client,
-                                        type_name,
-
+
+
+
-                                        THIS_MODULE)) < 0) {
-                err = i;
@@ -339 +406 @@
-static void smsc47m1_init_client(struct i2c_client *client)
-{
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -347 +436 @@
-{
-        struct smsc47m1_data *data = client->data;
-        int i;
-
-        down(&data->update_lock);
@@ -353 +441 @@
-        if ((jiffies - data->last_updated > HZ + HZ / 2) ||
-            (jiffies < data->last_updated) || !data->valid) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -369 +460 @@
-                if(data->alarms)
-                        smsc47m1_write_value(client, SMSC47M1_REG_ALARM1, 0xc0);
+
+                if (fan_nr >= 3) {
+                        data->fan_div[2] = (smsc47m1_read_value(client,
+                                            SMSC47M2_REG_FANDIV3) >> 4) & 0x03;
+                        data->alarms |= (smsc47m1_read_value(client,
+                                         SMSC47M2_REG_ALARM6) & 0x40) >> 4;
+                        if (data->alarms & 0x04)
+                                smsc47m1_write_value(client,
+                                                     SMSC47M2_REG_ALARM6,
+                                                     0x40);
+                }
+
-                data->last_updated = jiffies;
-                data->valid = 1;
@@ -381 +484 @@
-{
-        struct smsc47m1_data *data = client->data;
- + 1
+
-
-        if (operation == SENSORS_PROC_REAL_INFO)
@@ -387 +490 @@
-        else if (operation == SENSORS_PROC_REAL_READ) {
-                smsc47m1_update_client(client);
- - 1
- - 1
- - 1
- - 1
- - 1
+
+
+
+
+
-                *nrels_mag = 2;
-        } else if (operation == SENSORS_PROC_REAL_WRITE) {
-                if (*nrels_mag >= 1) {
-
-
-
-
-
-
+
+
+
+
-                }
-        }
@@ -434 +535 @@
-        } else if (operation == SENSORS_PROC_REAL_WRITE) {
-                old = smsc47m1_read_value(client, SMSC47M1_REG_FANDIV);
+                if (*nrels_mag >= 3 && data->type == smsc47m2) {
+                        data->fan_div[2] = DIV_TO_REG(results[2]);
+                        smsc47m1_write_value(client, SMSC47M2_REG_FANDIV3,
+                                (smsc47m1_read_value(client,
+                                 SMSC47M2_REG_FANDIV3) & 0xcf)
+                                | (data->fan_div[2] << 4));
+                }
-                if (*nrels_mag >= 2) {
-                        data->fan_div[1] = DIV_TO_REG(results[1]);
@@ -450 +558 @@
-{
-        struct smsc47m1_data *data = client->data;
-1 + 
+
-
-        if (operation == SENSORS_PROC_REAL_INFO)
@@ -456 +564 @@
-        else if (operation == SENSORS_PROC_REAL_READ) {
-                smsc47m1_update_client(client);
- - 1
- - 1
+
+
-                *nrels_mag = 2;
-        } else if (operation == SENSORS_PROC_REAL_WRITE) {
-                if (*nrels_mag >= 1) {
- - 1
-(nr)
- - 1
+
+[nr]
+
-                        if (*nrels_mag >= 2) {
-                                if (results[1]) {
-                                        /* enable PWM */
- - 1
+
-                                } else {
-                                        /* disable PWM */
- - 1
+
-                                }
-                        }
-(nr)
- - 1
+[nr]
+
-                }
-        }

lm-sensors/trunk/lib/chips.c

@@ -4665 +4665 @@
-  };
-
+static sensors_chip_feature smsc47m2_features[] =
+  { 
+    { { SENSORS_SMSC47M1_FAN1, "fan1", NOMAP, NOMAP, R },
+                               SMSC47M1_SYSCTL_FAN1, VALUE(2), 0 },
+    { { SENSORS_SMSC47M1_FAN2, "fan2", NOMAP, NOMAP, R },
+                               SMSC47M1_SYSCTL_FAN2, VALUE(2), 0 },
+    { { SENSORS_SMSC47M1_FAN3, "fan3", NOMAP, NOMAP, R },
+                               SMSC47M1_SYSCTL_FAN3, VALUE(2), 0 },
+    { { SENSORS_SMSC47M1_FAN1_MIN, "fan1_min", SENSORS_SMSC47M1_FAN1,
+                                   SENSORS_SMSC47M1_FAN1, RW },
+                                   SMSC47M1_SYSCTL_FAN1, VALUE(1), 0 },
+    { { SENSORS_SMSC47M1_FAN2_MIN, "fan2_min", SENSORS_SMSC47M1_FAN2,
+                                   SENSORS_SMSC47M1_FAN2, RW },
+                                   SMSC47M1_SYSCTL_FAN2, VALUE(1), 0 },
+    { { SENSORS_SMSC47M1_FAN3_MIN, "fan3_min", SENSORS_SMSC47M1_FAN3,
+                                   SENSORS_SMSC47M1_FAN3, RW },
+                                   SMSC47M1_SYSCTL_FAN3, VALUE(1), 0 },
+    { { SENSORS_SMSC47M1_FAN1_DIV, "fan1_div", SENSORS_SMSC47M1_FAN1, NOMAP, RW },
+                                   SMSC47M1_SYSCTL_FAN_DIV, VALUE(1), 0 },
+    { { SENSORS_SMSC47M1_FAN2_DIV, "fan2_div", SENSORS_SMSC47M1_FAN2, NOMAP, RW },
+                                   SMSC47M1_SYSCTL_FAN_DIV, VALUE(2), 0 },
+    { { SENSORS_SMSC47M1_FAN3_DIV, "fan3_div", SENSORS_SMSC47M1_FAN3, NOMAP, RW },
+                                   SMSC47M1_SYSCTL_FAN_DIV, VALUE(3), 0 },
+    { { SENSORS_SMSC47M1_ALARMS, "alarms", NOMAP, NOMAP, R },
+                                 SMSC47M1_SYSCTL_ALARMS, VALUE(1), 0 },
+    { { 0 }, 0 }
+  };
+
-static sensors_chip_feature smsc47m192_features[] =
-  { 
@@ -6006 +6034 @@
- { SENSORS_SMSC47M192_PREFIX, smsc47m192_features }, 
- { SENSORS_SMSC47M1_PREFIX, smsc47m1_features }, 
+ { SENSORS_SMSC47M2_PREFIX, smsc47m2_features }, 
- { SENSORS_PC87360_PREFIX, pc87360_features }, 
- { SENSORS_PC87363_PREFIX, pc87360_features }, 

lm-sensors/trunk/lib/chips.h

@@ -1835 +1835 @@
-
-#define SENSORS_SMSC47M1_PREFIX "smsc47m1"
+#define SENSORS_SMSC47M2_PREFIX "smsc47m2"
-
-#define SENSORS_SMSC47M1_FAN1 31 /* R */
-#define SENSORS_SMSC47M1_FAN2 32 /* R */
+#define SENSORS_SMSC47M1_FAN3 33 /* R */
-#define SENSORS_SMSC47M1_FAN1_MIN 41 /* RW */
-#define SENSORS_SMSC47M1_FAN2_MIN 42 /* RW */
+#define SENSORS_SMSC47M1_FAN3_MIN 43 /* RW */
-#define SENSORS_SMSC47M1_FAN1_DIV 75 /* RW */
-#define SENSORS_SMSC47M1_FAN2_DIV 76 /* RW */
+#define SENSORS_SMSC47M1_FAN3_DIV 77 /* RW */
-#define SENSORS_SMSC47M1_ALARMS 81 /* R */
-

lm-sensors/trunk/prog/sensors/chips.c

@@ -4596 +4596 @@
-  double cur, min, div;
-  int alarms, valid, i;
+  int is_m2 = !strcmp(name->prefix, "smsc47m2");
-
-  if (!sensors_get_feature(*name,SENSORS_SMSC47M1_ALARMS,&cur)) 
@@ -4604 +4605 @@
-  }
-
-=0; i<2; i++) { /* 2
+ = 0; i < (is_m2 ? 3 : 2); i++) { /* 2 or 3
-    if (!sensors_get_label_and_valid(*name, SENSORS_SMSC47M1_FAN1+i, &label, &valid)
-     && !sensors_get_feature(*name, SENSORS_SMSC47M1_FAN1+i, &cur)

lm-sensors/trunk/prog/sensors/main.c

@@ -392 +392 @@
-        { "smsc47m192", print_smsc47m192 },
-        { "smsc47m1", print_smsc47m1 },
+        { "smsc47m2", print_smsc47m1 },
-        { "pc87360", print_pc87360 },
-        { "pc87363", print_pc87360 },