Changeset 1188

Timestamp:

09/19/01 17:56:20 (7 years ago)

Author:

mds

Message:

Add 440MX and Victory66 support to piix4. Implement a

'supported' table. i2c adapter name and io region will
always be piix4 now - too hard to do 5 different names.

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/README (modified) (1 diff)
• lm-sensors/trunk/doc/busses/i2c-piix4 (modified) (2 diffs)
• lm-sensors/trunk/kernel/busses/i2c-piix4.c (modified) (14 diffs)

lm-sensors/trunk/CHANGES

@@ -20 +20 @@
-2.6.2 (2001????)
-  Module fscpos: new (Fujitsu-Siemens Poseidon driver)
+  Module i2c-piix4: Add Intel 82443MX and SMSC Victory66 support
-  Module via686a: Make limit initializations reliable
-  Program sensors-detect: Add ALI1535 detection,
+                          add Intel 82443MX detection,                  
-                          add Via VT8233 detection (no driver yet)
-

lm-sensors/trunk/README

@@ -39 +39 @@
-  Intel PIIX4 (used in many Intel chipsets)
-  Intel I810/I815 GMCH
+  Intel 82443MX (440MX)
-  ServerWorks OSB4, CSB5
-  SiS 5595
+  SMSC Victory66
-  3Dfx Voodoo 3 and Banshee
-
+/B
-
-

lm-sensors/trunk/doc/busses/i2c-piix4

@@ -5 +5 @@
-Supported adapters:
-  * Intel 82371AB PIIX4 and PIIX4E
+  * Intel 824443MX (440MX)
-    Datasheet: Publicly available at the Intel website
-  * ServerWorks OSB4 and CSB5 southbridges
-o
+O
-
-Author: Frodo Looijaard <frodol@dds.nl> and Philip Edelbrock
@@ -61 +62 @@
-driver on those mainboards.
-
-
+
+

lm-sensors/trunk/kernel/busses/i2c-piix4.c

@@ -22 +22 @@
-/*
-   Supports:
-
+, 440MX
-        Serverworks OSB4, CSB5
+        SMSC Victory66
-
-   Note: we assume there can only be one device, with one SMBus interface.
@@ -41 +42 @@
-#include <linux/init.h>
-
-Since the ServerWorks OSB4 SMBus host interface is
-'s,
+We assume all devices are
+;
-
-#ifndef PCI_DEVICE_ID_SERVERWORKS_OSB4
@@ -56 +57 @@
-#endif
-
+#ifndef PCI_DEVICE_ID_INTEL_82443MX_3
+#define PCI_DEVICE_ID_INTEL_82443MX_3   0x719b
+#endif
+
+#ifndef PCI_VENDOR_ID_EFAR
+#define PCI_VENDOR_ID_EFAR              0x1055
+#endif
+
+#ifndef PCI_DEVICE_ID_EFAR_SLC90E66_3
+#define PCI_DEVICE_ID_EFAR_SLC90E66_3   0x9463
+#endif
+
+struct sd {
+        const unsigned short mfr;
+        const unsigned short dev;
+        const unsigned char fn;
+        const char *name;
+};
+
+static struct sd supported[] = {
+        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3, 3, "PIIX4"},
+        {PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_OSB4, 0, "OSB4"},
+        {PCI_VENDOR_ID_SERVERWORKS, PCI_DEVICE_ID_SERVERWORKS_CSB5, 0, "CSB5"},
+        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443MX_3, 3, "440MX"},
+        {PCI_VENDOR_ID_EFAR, PCI_DEVICE_ID_EFAR_SLC90E66_3, 0, "Victory66"},
+        {0, 0, 0, NULL}
+};
-
-/* PIIX4 SMBus address offsets */
@@ -152 +180 @@
-static int __initdata piix4_initialized;
-static unsigned short piix4_smba = 0;
-static int kind = 0;
-
-/* Detect whether a PIIX4 can be found, and initialize it, where necessary.
@@ -162 +189 @@
-        int error_return = 0;
-        unsigned char temp;
-
-
-
-
+
+
+
-        if (pci_present() == 0) {
-                printk("i2c-piix4.o: Error: No PCI-bus found!\n");
-                error_return = -ENODEV;
-                goto END;
-        }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        if (PIIX4_dev == NULL) {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-                 error_return = -ENODEV;
-                 goto END;
-       } else { kind=1; /* Intel PIIX4 found */ 
-} else { kind=2; /* Serverworks OSB4 found */ }
+
+printk("i2c-piix4.o: Found %s device\n", num->name);
-
-
@@ -205 +223 @@
-                force = 0;
-        } else {
-
-                pci_read_config_word(PIIX4_dev, SMBBA, &piix4_smba);
-                piix4_smba &= 0xfff0;
@@ -212 +229 @@
-        if (check_region(piix4_smba, 8)) {
-                printk
-PIIX4_smb
+SMB
-                     piix4_smba);
-                error_return = -ENODEV;
@@ -226 +243 @@
-                pci_write_config_byte(PIIX4_dev, SMBHSTCFG, temp | 0x01);
-                printk
-PIIX4 
+
-                     "address %04x!\n", piix4_smba);
-        } else if ((temp & 1) == 0) {
@@ -239 +256 @@
-                                              temp | 1);
-                        printk
-PIIX4 
+
-                             "ENABLED!\n");
-                } else {
@@ -250 +267 @@
-
-        /* Everything is happy, let's grab the memory and set things up. */
-kind==1?"piix4-smbus":"osb
+"piix
-
-#ifdef DEBUG
-        if ((temp & 0x0E) == 8)
-                printk
-PIIX4 u
+U
-        else if ((temp & 0x0E) == 0)
-                printk
-PIIX4 u
+U
-        else
-                printk
-PIIX4: 
+
-                     "of date)!\n");
-
-        pci_read_config_byte(PIIX4_dev, SMBREV, &temp);
-        printk("i2c-piix4.o: SMBREV = 0x%X\n", temp);
-PIIX4_smba
+SMBA
-#endif                          /* DEBUG */
-
@@ -323 +340 @@
-        } while ((temp & 0x01) && (timeout++ < MAX_TIMEOUT));
-
+#ifdef DEBUG
-        /* If the SMBus is still busy, we give up */
-        if (timeout >= MAX_TIMEOUT) {
-#ifdef DEBUG
-                printk("i2c-piix4.o: SMBus Timeout!\n");
-                result = -1;
-
-
+
+
-
-        if (temp & 0x10) {
@@ -356 +373 @@
-                outb_p(inb(SMBHSTSTS), SMBHSTSTS);
-
+#ifdef DEBUG
-        if ((temp = inb_p(SMBHSTSTS)) != 0x00) {
-#ifdef DEBUG
-                printk
-                    ("i2c-piix4.o: Failed reset at end of transaction (%02x)\n",
-                     temp);
-
-
-
+
-        printk
-            ("i2c-piix4.o: Transaction (post): CNT=%02x, CMD=%02x, ADD=%02x, "
@@ -495 +510 @@
-        if ((res = piix4_setup())) {
-                printk
-PIIX4
+Device
-                piix4_cleanup();
-                return res;
-        }
-        piix4_initialized++;
-kind==1?"SMBus PIIX4 adapter at %04x":"SMBus OSB4/CSB5
+"SMBus PIIX4
-                piix4_smba);
-        if ((res = i2c_add_adapter(&piix4_adapter))) {
@@ -509 +524 @@
-        }
-        piix4_initialized++;
-PIIX4 b
+SMB
-        return 0;
-}