Changeset 1367 for lm-sensors/trunk/kernel/busses/i2c-amd756.c

Timestamp:

05/02/02 16:44:31 (11 years ago)

Author:

merlin

Message:

mh: Fix i2c-amd756 support for non-nForce chips (probably a
patch error vs changed source). Change module so it registers
the detected device in i2c under its own name (e.g,
AMD756/AMD766/AMD768/nVidia nForce rather than AMD7X6).
Updated sensors-detect accordingly.

Files:

• lm-sensors/trunk/kernel/busses/i2c-amd756.c (modified) (7 diffs)

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

@@ -3 +3 @@
               monitoring
 
-    Copyright (c) 1999 Merlin Hughes <merlin@merlin.org>
+    Copyright (c) 1999-2002 Merlin Hughes <merlin@merlin.org>
 
     Shamelessly ripped from i2c-piix4.c:
@@ -156 +156 @@
 
 static int __initdata amd756_initialized;
+static struct sd *amd756_sd = NULL;
 static unsigned short amd756_smba = 0;
 
@@ -197 +198 @@
                 if ((temp & 128) == 0) {
                         printk("i2c-amd756.o: Error: SMBus controller I/O not enabled!\n");
+                        return(-ENODEV);
                 }
-                return(-ENODEV);
 
                 /* Determine the address of the SMBus areas */
@@ -223 +224 @@
         printk("i2c-amd756.o: AMD756_smba = 0x%X\n", amd756_smba);
 #endif                          /* DEBUG */
+
+        /* store struct sd * for future reference */
+        amd756_sd = currdev;
 
         return 0;
@@ -482 +486 @@
         if ((res = amd756_setup())) {
                 printk
-                    ("i2c-amd756.o: AMD756/766 not detected, module not inserted.\n");
+                    ("i2c-amd756.o: AMD756 or compatible device not detected, module not inserted.\n");
                 amd756_cleanup();
                 return res;
         }
         amd756_initialized++;
-        sprintf(amd756_adapter.name, "SMBus AMD7X6 adapter at %04x",
-                amd756_smba);
+        sprintf(amd756_adapter.name, "SMBus %s adapter at %04x",
+                amd756_sd->name, amd756_smba);
         if ((res = i2c_add_adapter(&amd756_adapter))) {
                 printk
@@ -496 +500 @@
         }
         amd756_initialized++;
-        printk("i2c-amd756.o: AMD756/766 bus detected and initialized\n");
+        printk("i2c-amd756.o: %s bus detected and initialized\n",
+               amd756_sd->name);
         return 0;
 }
@@ -523 +528 @@
 
 MODULE_AUTHOR("Merlin Hughes <merlin@merlin.org>");
-MODULE_DESCRIPTION("AMD756/766 SMBus driver");
+MODULE_DESCRIPTION("AMD756/766/768/nVidia nForce SMBus driver");
 
 #ifdef MODULE_LICENSE