Changeset 1535

Timestamp:

09/18/02 21:17:30 (6 years ago)

Author:

phil

Message:

(Phil) Applied Alexander Malysh <amalysh@web.de>'s patch for
MC1066 support.

Files:

• lm-sensors/trunk/CONTRIBUTORS (modified) (1 diff)
• lm-sensors/trunk/doc/chips/adm1021 (modified) (3 diffs)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/adm1021.c (modified) (7 diffs)
• lm-sensors/trunk/lib/chips.c (modified) (1 diff)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (3 diffs)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/CONTRIBUTORS

@@ -77 +77 @@
-* Alexander Malysh <amalysh@web.de>
-  Author of the i2c-sis630 bus driver.
+  Added Onsemi MC1066 support to the adm1021 driver.
-

lm-sensors/trunk/doc/chips/adm1021

@@ -46 +46 @@
-    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e (inclusive)
-    Datasheet: Publicly available at the TI website
+  * Onsemi MC1066
+    Prefix `mc1066'
+    Addresses scanned: I2C 0x18 - 0x1a, 0x29 - 0x2b, 0x4c - 0x4e (inclusive)
+    Datasheet: Publicly available at the Onsemi website
-
-
@@ -74 +78 @@
-* probe_range: short array (min = 1, max = 48)
-  List of adapter,start-addr,end-addr triples to scan additionally
+* read_only: int (0 = disable, 1 = enable , default 0)
+  Read only mode.This is useful for Laptop's if BIOS managed Thermal Zone (Fan on/off).
+  Otherwise it confuse BIOS by writing any limit register's.
-
-
@@ -204 +211 @@
-  remote_temp_over       SENSORS_MAX1617A_REMOTE_TEMP_OVER        remote_temp:1
-            alarms                 SENSORS_MAX1617A_ALARMS             alarms:1
+
+
+Chip `mc1066'
+             LABEL        LABEL CLASS      COMPUTE CLASS ACCESS MAGNITUDE
+              temp               NONE               NONE     R     0
+          temp_low               temp               temp     RW    0
+         temp_over               temp               temp     RW    0
+       remote_temp               NONE               NONE     R     0
+   remote_temp_low        remote_temp        remote_temp     RW    0
+  remote_temp_over        remote_temp        remote_temp     RW    0
+            alarms               NONE               NONE     R     0
+
+             LABEL                          FEATURE SYMBOL        SYSCTL FILE:NR
+              temp                    SENSORS_MAX1617_TEMP               temp:3
+          temp_low               SENSORS_MAX1617_TEMP_HYST               temp:2
+         temp_over               SENSORS_MAX1617_TEMP_OVER               temp:1
+       remote_temp             SENSORS_MAX1617_REMOTE_TEMP        remote_temp:3
+   remote_temp_low        SENSORS_MAX1617_REMOTE_TEMP_HYST        remote_temp:2
+  remote_temp_over        SENSORS_MAX1617_REMOTE_TEMP_OVER        remote_temp:1
+            alarms                  SENSORS_MAX1617_ALARMS             alarms:1
+
-
-

lm-sensors/trunk/etc/sensors.conf.eg

@@ -1338 +1338 @@
-   set    aout        0
-
-
+ "mc1066-*"
-
-   label temp           "Board"

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

@@ -50 +50 @@
-
-/* Insmod parameters */
-7(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm
+8(adm1021, adm1023, max1617, max1617a, thmc10, lm84, gl523sm, mc1066
-
-/* adm1021 constants specified below */
@@ -59 +59 @@
-#define ADM1021_REG_REMOTE_TEMP 0x01
-#define ADM1021_REG_STATUS 0x02
-
+, 0x54 = Onsemi
-#define ADM1021_REG_DEV_ID 0x0FF        /* ADM1021 = 0x0X, ADM1023 = 0x3X */
-#define ADM1021_REG_DIE_CODE 0x0FF      /* MAX1617A */
@@ -156 +156 @@
-static void adm1021_update_client(struct i2c_client *client);
-
+/* (amalysh) read only mode, otherwise any limit's writing confuse BIOS */
+static int read_only = 0;
+
-
-/* This is the driver that will be inserted */
@@ -281 +284 @@
-                        (new_client, ADM1021_REG_CONV_RATE_R) == 0x00)
-                        kind = lm84;
+                else if (i == 0x54)
+                        kind = mc1066;
-                else
-                        kind = max1617;
@@ -306 +311 @@
-                type_name = "gl523sm";
-                client_name = "GL523SM chip";
+        } else if (kind == mc1066) {
+                type_name = "mc1066";
+                client_name = "MC1066 chip";
-        } else {
-#ifdef DEBUG
@@ -421 +429 @@
-int adm1021_write_value(struct i2c_client *client, u8 reg, u16 value)
-{
+        if (read_only > 0)
+                return 0;
+
-        return i2c_smbus_write_byte_data(client, reg, value);
-}
@@ -642 +653 @@
-MODULE_DESCRIPTION("adm1021 driver");
-
+MODULE_PARM(read_only, "i");
+MODULE_PARM_DESC(read_only, "Don't set any values, read only mode");
+
-int init_module(void)
-{

lm-sensors/trunk/lib/chips.c

@@ -2995 +2995 @@
- { SENSORS_ADM1021_PREFIX, adm1021_features },
- { SENSORS_MAX1617_PREFIX, max1617_features },
+ { SENSORS_MC1066_PREFIX, max1617_features },
- { SENSORS_MAX1617A_PREFIX, max1617a_features },
-                /* Cheat on LM84 for now - no separate #defines */

lm-sensors/trunk/lib/chips.h

@@ -188 +188 @@
-
-#define SENSORS_MAX1617_PREFIX "max1617"
+#define SENSORS_MC1066_PREFIX "mc1066"
-
-#define SENSORS_MAX1617_TEMP 51 /* R */

lm-sensors/trunk/prog/detect/sensors-detect

@@ -909 +909 @@
-       i2c_addrs => [0x18..0x1a,0x29..0x2b,0x4c..0x4e],
-       i2c_detect => sub { adm1021_detect 5, @_ },
+     },
+     {
+       name => "Onsemi MC1066",
+       driver => "adm1021",
+       i2c_addrs => [0x18..0x1a,0x29..0x2b,0x4c..0x4e],
+       i2c_detect => sub { adm1021_detect 6, @_ },
-     },
-     {
@@ -2263 +2269 @@
-
-# $_[0]: Chip to detect
-
+, 6 = MC1066
-# $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
@@ -2285 +2291 @@
-  return if $chip == 2 and i2c_smbus_read_byte_data($file,0xfe) != 0x4d and
-                           i2c_smbus_read_byte_data($file,0xff) != 0x01;
+  return if $chip == 6 and i2c_smbus_read_byte_data($file,0xfe) != 0x54;
-  # The remaining things are flaky at best. Perhaps something can be done
-  # with the fact that some registers are unreadable?

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

@@ -302 +302 @@
-           !strcmp(name.prefix,"max1617a") || !strcmp(name.prefix, "thmc10") ||
-           !strcmp(name.prefix,"lm84") || !strcmp(name.prefix, "gl523") ||
-
+ || !strcmp(name.prefix, "mc1066")
-    print_adm1021(&name);
-  else if (!strcmp(name.prefix,"adm9240") ||