Changeset 2713

Timestamp:

10/08/04 20:42:07 (9 years ago)

Author:

khali

Message:

Support secondary Super-I/O address (0x4e/0x4f).

Files:

• lm-sensors/trunk/kernel/chips/pc87360.c (modified) (12 diffs)

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

@@ -79 +79 @@
  */
 
-#define REG     0x2e    /* The register to read/write */
-#define VAL     0x2f    /* The value to read/write */
-
 #define DEV     0x07    /* Register: Logical device select */
 #define DEVID   0x20    /* Register: Device ID */
@@ -96 +93 @@
 #define LD_TEMP         2
 
-static inline void superio_outb(int reg, int val)
-{
-        outb(reg, REG);
-        outb(val, VAL);
-}
-
-static inline int superio_inb(int reg)
-{
-        outb(reg, REG);
-        return inb(VAL);
-}
-
-static inline void superio_exit(void)
-{
-        outb(0x02, REG);
-        outb(0x02, VAL);
+static inline void superio_outb(int sioaddr, int reg, int val)
+{
+        outb(reg, sioaddr);
+        outb(val, sioaddr+1);
+}
+
+static inline int superio_inb(int sioaddr, int reg)
+{
+        outb(reg, sioaddr);
+        return inb(sioaddr+1);
+}
+
+static inline void superio_exit(int sioaddr)
+{
+        outb(0x02, sioaddr);
+        outb(0x02, sioaddr+1);
 }
 
@@ -242 +239 @@
 static void pc87360_init_client(struct i2c_client *client, int use_thermistors);
 static void pc87360_update_client(struct i2c_client *client);
-static int pc87360_find(u8 *devid, int *address);
 
 
@@ -476 +472 @@
 }
 
-static int pc87360_find(u8 *devid, int *address)
+static int pc87360_find(int sioaddr, u8 *devid, int *address)
 {
         u16 val;
@@ -485 +481 @@
 
         /* Identify device */
-        val = superio_inb(DEVID);
+        val = superio_inb(sioaddr, DEVID);
         switch (val) {
         case 0xE1: /* PC87360 */
@@ -497 +493 @@
                 break;
         default:
-                superio_exit();
+                superio_exit(sioaddr);
                 return -ENODEV;
         }
@@ -505 +501 @@
         for (i = 0; i < nrdev; i++) {
                 /* select logical device */
-                superio_outb(DEV, logdev[i]);
-
-                val = superio_inb(ACT);
+                superio_outb(sioaddr, DEV, logdev[i]);
+
+                val = superio_inb(sioaddr, ACT);
                 if (!(val & 0x01)) {
                         printk(KERN_INFO "pc87360.o: Device 0x%02x not "
@@ -514 +510 @@
                 }
 
-                val = (superio_inb(BASE) << 8)
-                    | superio_inb(BASE + 1);
+                val = (superio_inb(sioaddr, BASE) << 8)
+                    | superio_inb(sioaddr, BASE + 1);
                 if (!val) {
                         printk(KERN_INFO "pc87360.o: Base address not set for "
@@ -525 +521 @@
 
                 if (i==0) { /* Fans */
-                        confreg[0] = superio_inb(0xF0);
-                        confreg[1] = superio_inb(0xF1);
+                        confreg[0] = superio_inb(sioaddr, 0xF0);
+                        confreg[1] = superio_inb(sioaddr, 0xF1);
                         
 #ifdef DEBUG
@@ -545 +541 @@
                                    specific, just that we won't need them if
                                    we don't use the VLM device */
-                                confreg[2] = superio_inb(0x2B);
-                                confreg[3] = superio_inb(0x25);
+                                confreg[2] = superio_inb(sioaddr, 0x2B);
+                                confreg[3] = superio_inb(sioaddr, 0x25);
 
                                 if (confreg[2] & 0x40) {
@@ -562 +558 @@
         }
 
-        superio_exit();
+        superio_exit(sioaddr);
         return 0;
 }
@@ -1319 +1315 @@
         printk(KERN_INFO "pc87360.o version %s (%s)\n", LM_VERSION, LM_DATE);
 
-        if (pc87360_find(&devid, extra_isa)) {
+        if (pc87360_find(0x2e, &devid, extra_isa)
+         && pc87360_find(0x4e, &devid, extra_isa)) {
                 printk(KERN_WARNING "pc87360.o: PC8736x not detected, "
                        "module not inserted.\n");