Changeset 1658

Timestamp:

12/01/02 22:30:13 (10 years ago)

Author:

mds

Message:

compile fixes for i2c-amd8111.c, and add support in mkpatch.

Patch from

Vojtech Pavlik <vojtech@…>

Location:

lm-sensors/trunk

Files:

• doc/busses/i2c-amd8111 (modified) (1 diff)
• kernel/busses/Module.mk (modified) (1 diff)
• kernel/busses/i2c-amd8111.c (modified) (7 diffs)
• mkpatch/mkpatch.pl (modified) (7 diffs)

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

@@ -46 +46 @@
 supported by this driver, and the SMBus 1.0 adapter is supported
 by the i2c-amd756 driver.
-
-The 8111 used with the AMD Hammer. While the module should work either with
-CONFIG_X86 or CONFIG_X86_64, it will only be compiled with CONFIG_X86_64
-(as it was the easiest way to prevent compilation in 2.2 kernels).
-If you would like to compile it for CONFIG_X86, modify kernel/busses/Module.mk.

lm-sensors/trunk/kernel/busses/Module.mk

@@ -41 +41 @@
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-amd756.o
 endif
-# Should also work for CONFIG_X86 but this is the easiest way to prevent compilation in 2.2 kernels...
-ifeq ($(shell if grep -q '^CONFIG_X86_64=' $(LINUX)/.config; then echo 1; fi),1)
 ifneq ($(shell if grep -q '^CONFIG_I2C_AMD8111=y' $(LINUX)/.config; then echo 1; fi),1)
 KERNELBUSSESTARGETS += $(MODULE_DIR)/i2c-amd8111.o
-endif
 endif
 ifneq ($(shell if grep -q '^CONFIG_I2C_HYDRA=y' $(LINUX)/.config; then echo 1; fi),1)

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

@@ -26 +26 @@
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+#define min_t(t, x, y)  (((x)<(y))?(x):(y))
+#define __devinit
+#define __devexit
+#define __devinitdata
+struct pci_device_id {
+        unsigned int vendor, device;
+        unsigned int subvendor, subdevice;
+        unsigned int class, class_mask;
+        unsigned long driver_data;
+};
+struct pci_driver {
+        struct list_head node;
+        char *name;
+        const struct pci_device_id *id_table;
+        int (*probe)(struct pci_dev *dev, const struct pci_device_id *id);
+        void (*remove)(struct pci_dev *dev);
+};
+#define PCI_ANY_ID      0xffff
+#define IORESOURCE_IO 0x00000100
+#endif
+
+#ifdef MODULE_LICENSE
 MODULE_LICENSE("GPL");
+#endif
 MODULE_AUTHOR ("Vojtech Pavlik <vojtech@suse.cz>");
 MODULE_DESCRIPTION("AMD8111 SMBus 2.0 driver");
@@ -360 +384 @@
                 return -1;
 
-        if (!(smbus = kmalloc(sizeof(struct amd_smbus), GFP_KERNEL)))
+        if (!(smbus = (void*)kmalloc(sizeof(struct amd_smbus), GFP_KERNEL)))
                 return -1;
         memset(smbus, 0, sizeof(struct amd_smbus));
@@ -369 +393 @@
         smbus->size = pci_resource_len(dev, 0);
 
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,14)
         if (!request_region(smbus->base, smbus->size, "amd8111 SMBus 2.0")) {
                 kfree(smbus);
                 return -1;
         }
+#else
+        if (check_region(smbus->base, smbus->size) < 0) {
+                kfree(smbus);
+                return -1;
+        }
+        request_region(smbus->base, smbus->size, "amd8111 SMBus 2.0");
+#endif
 
         sprintf(smbus->adapter.name, "SMBus2 AMD8111 adapter at %04x", smbus->base);
@@ -390 +422 @@
         pci_write_config_dword(smbus->dev, AMD_PCI_MISC, 0);
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+        printk(KERN_INFO "i2c-amd8111.c: AMD8111 SMBus 2.0 adapter at %#x\n", smbus->base);
+#else
         printk(KERN_INFO "i2c-amd8111.c: AMD8111 SMBus 2.0 adapter at pci%s\n", dev->slot_name);
+#endif
         return 0;
 }
@@ -396 +432 @@
 static void __devexit amd8111_remove(struct pci_dev *dev)
 {
-        struct amd_smbus *smbus = pci_get_drvdata(dev);
+        struct amd_smbus *smbus = (void*) pci_get_drvdata(dev);
         if (i2c_del_adapter(&smbus->adapter)) {
                 printk(KERN_WARNING "i2c-amd8111.c: Failed to unregister adapter.\n");
@@ -408 +444 @@
 {{ 0x1022, 0x746a, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
  { 0 }};
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)
+
+static struct pci_dev *amd8111_devs[8] = { NULL, /* ... */ };
+static int amd8111_devcnt = 0;
+
+int i2c_amd_8111_init(void)
+{
+        struct pci_dev *pci;
+        struct pci_device_id *id;
+        int found = 0;
+
+        for (id = amd8111_id_table; id->vendor; id++) {
+                pci = NULL;
+                while ((pci = pci_find_device(id->vendor, id->device, pci)))
+                        if (amd8111_devcnt < 8 && !amd8111_probe(pci, id))
+                                amd8111_devs[amd8111_devcnt++] = pci;
+        }
+
+        return found ? 0 : -ENODEV;
+}
+
+#ifdef MODULE
+int init_module(void)
+{
+        return i2c_amd8111_init();
+}
+
+int cleanup_module(void)
+{
+        int i;
+        for (i = 0; i < amd8111_devcnt; i++)
+                amd8111_remove(amd8111_devs[i]);
+}
+#endif 
+
+#else
 
 static struct pci_driver amd8111_driver = {
@@ -428 +501 @@
 module_init(amd8111_init);
 module_exit(amd8111_exit);
+
+#endif

lm-sensors/trunk/mkpatch/mkpatch.pl

@@ -80 +80 @@
            m@Acer Labs ALI 1535@ or
            m@Acer Labs ALI 1533 and 1543C@ or
-           m@AMD 756/766@ or
+           m@AMD 756/766/768/8111@ or
+           m@AMD 8111 SMBus 2.0@ or
            m@Apple Hydra Mac I/O@ or
            m@Intel I801@ or
@@ -143 +144 @@
   is running.
 
-AMD 756/766/768
+AMD 756/766/768/8111
 CONFIG_I2C_AMD756
   If you say yes to this option, support will be included for the AMD
-  756/766/768 mainboard I2C interfaces. This can also be 
+  756/766/768/8111 mainboard I2C interfaces. This can also be 
+  built as a module which can be inserted and removed while the kernel
+  is running.
+
+AMD 8111 SMBus 2.0
+CONFIG_I2C_AMD8111
+  If you say yes to this option, support will be included for the AMD
+  8111 mainboard SMBus 2.0 interface. This can also be 
   built as a module which can be inserted and removed while the kernel
   is running.
@@ -801 +809 @@
     dep_tristate '  Acer Labs ALI 1533 and 1543C' CONFIG_I2C_ALI15X3 $CONFIG_I2C
     dep_tristate '  Apple Hydra Mac I/O' CONFIG_I2C_HYDRA $CONFIG_I2C_ALGOBIT
-    dep_tristate '  AMD 756/766/768' CONFIG_I2C_AMD756 $CONFIG_I2C
+    dep_tristate '  AMD 756/766/768/8111' CONFIG_I2C_AMD756 $CONFIG_I2C
+    dep_tristate '  AMD 8111 SMBus 2.0' CONFIG_I2C_AMD8111 $CONFIG_I2C
     dep_tristate '  DEC Tsunami I2C interface' CONFIG_I2C_TSUNAMI $CONFIG_I2C_ALGOBIT $CONFIG_ALPHA
     dep_tristate '  Intel 82801AA, AB, BA, DB' CONFIG_I2C_I801 $CONFIG_I2C
@@ -1173 +1182 @@
 obj-$(CONFIG_I2C_ALI15X3)               += i2c-ali15x3.o
 obj-$(CONFIG_I2C_AMD756)                += i2c-amd756.o
+obj-$(CONFIG_I2C_AMD8111)               += i2c-amd8111.o
 obj-$(CONFIG_I2C_HYDRA)                 += i2c-hydra.o
 obj-$(CONFIG_I2C_I801)                  += i2c-i801.o
@@ -1214 +1224 @@
 endif
 
+ifeq ($(CONFIG_I2C_AMD8111),y)
+  L_OBJS += i2c-amd8111.o
+else 
+  ifeq ($(CONFIG_I2C_AMD8111),m)
+    M_OBJS += i2c-amd8111.o
+  endif
+endif
+
 ifeq ($(CONFIG_I2C_HYDRA),y)
   L_OBJS += i2c-hydra.o
@@ -1364 +1382 @@
         extern int i2c_amd756_init(void);
 #endif
+#ifdef CONFIG_I2C_AMD8111
+        extern int i2c_amd8111_init(void);
+#endif
 #ifdef CONFIG_I2C_HYDRA
         extern int i2c_hydra_init(void);
@@ -1414 +1435 @@
 #ifdef CONFIG_I2C_AMD756
         i2c_amd756_init();
+#endif
+#ifdef CONFIG_I2C_AMD8111
+        i2c_amd8111_init();
 #endif
 #ifdef CONFIG_I2C_HYDRA