Changeset 614

Timestamp:

10/30/99 23:26:21 (9 years ago)

Author:

mds

Message:

(mds) Add support for the Asus AS99127F. Treat as an I2C-only W83782D for now.

Files:

• lm-sensors/trunk/CONTRIBUTORS (modified) (1 diff)
• lm-sensors/trunk/README (modified) (1 diff)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/w83781d (modified) (3 diffs)
• lm-sensors/trunk/kernel/chips/w83781d.c (modified) (9 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) (5 diffs)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/CONTRIBUTORS

@@ -26 +26 @@
-* Mark D. Studebaker <mds@eng.paradyne.com>
-  Author of the i2c-ali15x3 bus driver and the i2c-i810 bus driver.
-and w83627h
- and thmc10
+w83627hf, and as99127
+, thmc10, gl523sm, and lm84
-  Added lm81 support to the adm9240 driver.
-  Author of the decode-xeon.pl xeon EEPROM decoder.

lm-sensors/trunk/README

@@ -28 +28 @@
-
-At least the following SMBus adapters are supported:
+  Acer Labs M1541 and M1543C (used in the Aladdin IV, V and Pro 2 chipsets)
+  Apple Hydra (used on some PPC machines)
+  Intel ICH (used in the Intel 810 and 810E chipsets)
-  Intel PIIX4 (used in most Intel chipsets)
-  Intel ICH (used in the Intel 810 and 810E chipsets)
-  Acer Labs M1541 and M1543C (used in the Aladdin IV, V and Pro 2 chipsets)
-  VIA Technologies 82C586B (used in most VIA chipsets)
-  VIA Technologies VT596A/B (used in some more modern VIA chipsets)
-  Apple Hydra (used on some PPC machines)
-
-At least the following hardware sensor chips are supported:
+  Analog Devices ADM1021, ADM1022, and ADM9240
+  Asus AS99127F
+  Dallas Semiconductor DS1780
+  Hewlett Packard Maxilife (several revisions)
+  Genesys Logic GL518SM (rev 00, 80), GL520SM, GL523SM
+  Intel Xeon processor embedded sensors
+  Maxim MAX1617 and MAX1617A
-  National Semicoductor LM75, LM77, LM78, LM78-J, LM79. LM80, LM81, and LM84
-  Winbond W83781D, W83782D, W83783S, and W83627HF
-  Genesys Logic GL518SM (rev 00, 80), GL520SM, GL523SM
-  Analog Devices ADM1021, ADM1022, and ADM9240
-  SiS Southbridge (integrated in the chipset; the I2C adapter will also be
-    supported in the near future)
-  Maxim MAX1617 and MAX1617A
-  Dallas Semiconductor DS1780
-  Hewlett Packard Maxilife (several revisions)
-  Intel Xeon processor embedded sensors
-  TI THMC10 and THMC50
+  Winbond W83781D, W83782D, W83783S, and W83627HF
+
-
-We also support some miscellaneous chips:

lm-sensors/trunk/doc/chips/SUMMARY

@@ -86 +86 @@
-
-w83781d
+        as99127f        3       9       3       2-4 pwm yes     no
-        w83781d         3       7       3       -       yes     yes
-        w83782d         3       9       3       2-4 pwm yes     yes

lm-sensors/trunk/doc/chips/w83781d

@@ -21 +21 @@
-    Prefix 'w83627hf'
-    Addresses scanned: I2C 0x20 - 0x2f (inclusive), ISA 0x290 (8 I/O ports)
-
+
+
+
+
+
-
-
@@ -56 +60 @@
-
-This driver implements support for the Winbond W83781D, W83782D,
-
+, and the Asus AS99127F
-We will refer to them collectively as W8378* chips.
-
@@ -62 +66 @@
-enough that it was sensible to put them together in one driver. 
-The W83627HF chip is assumed to be identical to the W83782D.
+The AS99127F chip is assumed to be identical to an I2C-only W83782D.
-
-Detection of these chips can sometimes be foiled because they can be in

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

@@ -24 +24 @@
-    Supports following chips:
-
-
-
-
-
-
+
+
+
+
+
+
-
-*/
@@ -63 +64 @@
-
-/* Insmod parameters */
-4(w83781d,w83782d,w83783s,w83627h
+5(w83781d,w83782d,w83783s,w83627hf,as99127
-
-/* Many W83781D constants specified below */
@@ -647 +648 @@
-  const char *client_name = "";
-  int is_isa = i2c_is_isa_adapter(adapter);
+  enum vendor {winbond, asus} vendid;
-
-  if (!is_isa && ! i2c_check_functionality(adapter,I2C_FUNC_SMBUS_BYTE_DATA))
@@ -725 +727 @@
-
-  /* We have either had a force parameter, or we have already detected the
-
+and Vendor ID High Byte 
-  w83781d_write_value(new_client,W83781D_REG_BANK,
-w83781d_read_value(new_client,W83781D_REG_BANK) & 0xf8
+(w83781d_read_value(new_client,W83781D_REG_BANK) & 0x78) | 0x80
-
-  /* Determine the chip type. */
-  if (kind <= 0) {
+    /* get vendor ID */
+    val2 = w83781d_read_value(new_client,W83781D_REG_CHIPMAN);
+    if (val2 == 0x5c)
+      vendid = winbond;
+    else if (val2 == 0x12)
+      vendid = asus;
+    else
+      goto ERROR1;
-    /* mask off lower bit, not reliable */
-    val1 = w83781d_read_value(new_client,W83781D_REG_WCHIPID) & 0xfe;
-
+ && vendid == winbond
-      kind = w83781d;
-
+ && vendid == winbond
-      kind = w83782d;
-
+ && vendid == winbond && !is_isa
-      kind = w83783s;
-
+ && vendid == winbond
-      kind = w83627hf;
+    else if (val1 == 0x20 && vendid == asus && !is_isa)
+      kind = as99127f;
-    else {
-      if (kind == 0) 
@@ -761 +773 @@
-    type_name = "w83627hf";
-    client_name = "W83627HF chip";
+  } else if (kind == as99127f) {
+    type_name = "as99127f";
+    client_name = "AS99127F chip";
-  } else {
-#ifdef DEBUG
@@ -1044 +1059 @@
-                        IN_TO_REG(W83782D_INIT_IN_MAX_6));
-  }
-
+ || (type == as99127f)
-    w83781d_write_value(client,W83781D_REG_IN_MIN(7),
-                        IN_TO_REG(W83781D_INIT_IN_MIN_7));
@@ -1105 +1120 @@
-      data->in_min[i] = w83781d_read_value(client,W83781D_REG_IN_MIN(i));
-      data->in_max[i] = w83781d_read_value(client,W83781D_REG_IN_MAX(i));
-
+
+
-        break;
-    }
@@ -1116 +1132 @@
-        data->pwm[i-1] = w83781d_read_value(client,W83781D_REG_PWM(i));
-        if(((data->type == w83783s) ||
-) &&
-
+ ||
+ data->type == as99127f) && 
-          &&  i == 2)
-          break;
@@ -1147 +1163 @@
-    data->alarms = w83781d_read_value(client,W83781D_REG_ALARM1) +
-                   (w83781d_read_value(client,W83781D_REG_ALARM2) << 8);
-
+ || data->type == as99127f
-      data->alarms |= w83781d_read_value(client,W83781D_REG_ALARM3) << 16;
-    }

lm-sensors/trunk/lib/chips.c

@@ -1537 +1537 @@
-                /* Cheat on 627HF for now - no separate #defines */
- { SENSORS_W83627HF_PREFIX, w83782d_features },
+                /* Cheat on1627HF for now - no separate #defines */
+ { SENSORS_AS99127F_PREFIX, w83782d_features },
- { SENSORS_ADM9240_PREFIX, adm9240_features },
- { SENSORS_DS1780_PREFIX, ds1780_features },

lm-sensors/trunk/lib/chips.h

@@ -367 +367 @@
-/* Winbond W83782D chips */
-/* Cheat on 627HF for now - no separate #defines */
+/* Cheat on 127F for now - no separate #defines */
-
-#define SENSORS_W83782D_PREFIX "w83782d"
-#define SENSORS_W83627HF_PREFIX "w83627hf"
+#define SENSORS_AS99127F_PREFIX "as99127f"
-
-#define SENSORS_W83782D_IN0 1 /* R */

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

@@ -232 +232 @@
-     } ,
-     {
+       name => "Asus AS99127F",
+       driver => "w83781d",
+       i2c_addrs => [0x00..0x68,0x6a..0x7f], 
+       i2c_driver_addrs => [0x20..0x2f], 
+       i2c_detect => sub { w83781d_detect 4, @_},
+     } ,
+     {
-       name => "Genesys Logic GL518SM Revision 0x00",
-       driver => "gl518sm",
@@ -1265 +1272 @@
-}
-  
-
+
+
-# $_[1]: A reference to the file descriptor to access this chip.
-#        We may assume an i2c_set_slave_addr was already done.
@@ -1276 +1284 @@
-#   0x4e: Vendor ID byte selection, and bank selection
-#   0x4f: Vendor ID
-
-
+
-# Note: Fails if the W8378xD is not in bank 0!
-# Note: Detection overrules a previous LM78 detection
@@ -1287 +1294 @@
-  $reg1 = i2c_smbus_read_byte_data($file,0x4e);
-  $reg2 = i2c_smbus_read_byte_data($file,0x4f);
-
-
+
+
+
+
+
+
+
+
-  return unless ($reg1 & 0x07) == 0x00;
-  $reg1 = i2c_smbus_read_byte_data($file,0x58) & 0xfe;
@@ -1295 +1308 @@
-  return if $chip == 2 and  $reg1 != 0x40;
-  return if $chip == 3 and  $reg1 != 0x20;
+  return if $chip == 4 and  $reg1 != 0x20;
-  $reg1 = i2c_smbus_read_byte_data($file,0x4a);
-  @res = (8);

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

@@ -812 +812 @@
-
-  is82d = (!strcmp(name->prefix,"w83782d")) ||
-
+
+
-  is83s = !strcmp(name->prefix,"w83782s");
-  if (!sensors_get_feature(*name,SENSORS_W83781D_ALARMS,&cur)) 

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

@@ -269 +269 @@
-           (!strcmp(name.prefix,"w83782d")) ||
-           (!strcmp(name.prefix,"w83783s")) ||
-
+
+
-    print_w83781d(&name);
-  else if (!strcmp(name.prefix,"maxilife-cg") ||