Changeset 2243

Timestamp:

01/25/04 18:26:22 (9 years ago)

Author:

khali

Message:

Separate prefix for NE1619.

Location:

lm-sensors/trunk

Files:

• doc/chips/adm1025 (modified) (3 diffs)
• etc/sensors.conf.eg (modified) (1 diff)
• kernel/chips/adm1025.c (modified) (4 diffs)
• lib/chips.c (modified) (1 diff)
• lib/chips.h (modified) (1 diff)
• prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/doc/chips/adm1025

@@ -10 +10 @@
     Datasheet: Publicly available at the Analog Devices website
   * Philips NE1619
-    Prefix `adm1025'
-    Addresses scanned: I2C 0x2c - 0x2e (inclusive)
+    Prefix `ne1619'
+    Addresses scanned: I2C 0x2c - 0x2d (inclusive)
     Datasheet: Publicly available at the Philips website
 
 The NE1619 presents some differences with the original ADM1025:
-  * Only two possible addresses (0x2c - 0x2d), although we don't care.
+  * Only two possible addresses (0x2c - 0x2d).
   * No temperature offset register, but we don't use it anyway.
   * No INT mode for pin 16. We don't play with it anyway.
-No separate prefix was added for the NE1619, it just wasn't worth it.
 
 Author: Chen-Yuan Wu <gwu@esoft.com> and Jean Delvare <khali@linux-fr.org>
@@ -33 +32 @@
   List of adapter,address pairs which are unquestionably assumed to contain
   a `adm1025' chip
+* force_ne1619: short array (min = 1, max = 48)
+  List of adapter,address pairs which are unquestionably assumed to contain
+  a `ne1619' chip
 * probe: short array (min = 1, max = 48)
   List of adapter,address pairs to scan additionally
@@ -73 +75 @@
 -------------
 
-Chip 'adm1025'
+Chips 'adm1025' and 'ne1619'
 
 LABEL                 LABEL CLASS           COMPUTE CLASS          MODE  MAGN

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

@@ -1132 +1132 @@
 #    ignore temp3
 
-chip "adm1025-*"
+chip "adm1025-*" "ne1619-*"
 
 # The ADM1025 has integrated scaling resistors, rather

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

@@ -3 +3 @@
                monitoring
     Copyright (c) 2000 Chen-Yuan Wu <gwu@esoft.com>
-    Copyright (c) 2003 Jean Delvare <khali@linux-fr.org>
+    Copyright (c) 2003-2004 Jean Delvare <khali@linux-fr.org>
 
     Based on the adm9240 driver.
@@ -48 +48 @@
 
 /* Insmod parameters */
-SENSORS_INSMOD_1(adm1025);
+SENSORS_INSMOD_2(adm1025, ne1619);
 
 /* Many ADM1025 constants specified below */
@@ -292 +292 @@
         /* Determine the chip type. */
         if (kind <= 0) {
-                i = i2c_smbus_read_byte_data(new_client, ADM1025_REG_COMPANY_ID);
-                if (((i2c_smbus_read_byte_data(new_client, ADM1025_REG_DIE_REV) & 0xf0) == 0x20)
-                 && ((i == 0x41)   /* ADM1025 */
-                  || (i == 0xA1))) /* NE1619 */
-                        kind = adm1025;
-                else {
-                        if (kind == 0)
-                                printk
-                                    ("adm1025.o: Ignoring 'force' parameter for unknown chip at "
-                                     "adapter %d, address 0x%02x\n",
-                                     i2c_adapter_id(adapter), address);
-                        goto ERROR1;
-                }
+                u8 man_id, chip_id;
+                
+                man_id = i2c_smbus_read_byte_data(new_client,
+                         ADM1025_REG_COMPANY_ID);
+                chip_id = i2c_smbus_read_byte_data(new_client,
+                          ADM1025_REG_DIE_REV);
+                
+                if (man_id == 0x41) { /* Analog Devices */
+                        if ((chip_id & 0xF0) == 0x20) /* ADM1025 */
+                                kind = adm1025;
+                } else if (man_id == 0xA1) { /* Philips */
+                        if (address != 0x2E
+                         && (chip_id & 0xF0) == 0x20) /* NE1619 */
+                                kind = ne1619;
+                }
+        }
+
+        if (kind <= 0) { /* Identification failed */
+                printk("adm1025.o: Unsupported chip.\n");
+                goto ERROR1;
         }
 
@@ -310 +317 @@
                 type_name = "adm1025";
                 client_name = "ADM1025 chip";
+        } else if (kind == ne1619) {
+                type_name = "ne1619";
+                client_name = "NE1619 chip";            
         } else {
 #ifdef DEBUG

lm-sensors/trunk/lib/chips.c

@@ -4813 +4813 @@
  { SENSORS_ADM1022_PREFIX, thmc50_features },
  { SENSORS_ADM1025_PREFIX, adm1025_features },
+ { SENSORS_NE1619_PREFIX, adm1025_features },
  { SENSORS_ADM1026_PREFIX, adm1026_features },
  { SENSORS_VIA686A_PREFIX, via686a_features },

lm-sensors/trunk/lib/chips.h

@@ -967 +967 @@
 
 #define SENSORS_ADM1025_PREFIX "adm1025"
+#define SENSORS_NE1619_PREFIX "ne1619"
 
 #define SENSORS_ADM1025_IN0 1 /* R */

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

@@ -362 +362 @@
         { "gl518sm", print_gl518 },
         { "adm1025", print_adm1025 },
+        { "ne1619", print_adm1025 },
         { "adm1024", print_adm1024 },
         { "w83781d", print_w83781d },