11 files changed, 61 insertions, 12 deletions

diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index a878c98e252e..85064fb0b7c2 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -44,6 +44,10 @@ static int force_start;
 module_param(force_start, bool, 0);
 MODULE_PARM_DESC(force_start, "Force the chip to start monitoring inputs");
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 /* Addresses to scan */
 static unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
 
@@ -2191,7 +2195,7 @@ static int __init dme1737_isa_detect(int sio_cip, unsigned short *addr)
         /* Check device ID
          * We currently know about SCH3112 (0x7c), SCH3114 (0x7d), and
          * SCH3116 (0x7f). */
-        reg = dme1737_sio_inb(sio_cip, 0x20);
+        reg = force_id ? force_id : dme1737_sio_inb(sio_cip, 0x20);
         if (!(reg == 0x7c || reg == 0x7d || reg == 0x7f)) {
                 err = -ENODEV;
                 goto exit;
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 5d9d5cc816a2..7a14a2dbb752 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -41,6 +41,10 @@
 #include <linux/ioport.h>
 #include <asm/io.h>
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 static struct platform_device *pdev;
 
 #define DRVNAME "f71805f"
@@ -1497,7 +1501,7 @@ static int __init f71805f_find(int sioaddr, unsigned short *address,
         if (devid != SIO_FINTEK_ID)
                 goto exit;
 
-        devid = superio_inw(sioaddr, SIO_REG_DEVID);
+        devid = force_id ? force_id : superio_inw(sioaddr, SIO_REG_DEVID);
         switch (devid) {
         case SIO_F71805F_ID:
                 sio_data->kind = f71805f;
diff --git a/drivers/hwmon/f71882fg.c b/drivers/hwmon/f71882fg.c
index 6db74434a02e..cbeb4984b5c7 100644
--- a/drivers/hwmon/f71882fg.c
+++ b/drivers/hwmon/f71882fg.c
@@ -74,6 +74,10 @@
 
 #define FAN_MIN_DETECT                  366 /* Lowest detectable fanspeed */
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 static struct platform_device *f71882fg_pdev = NULL;
 
 /* Super-I/O Function prototypes */
@@ -843,7 +847,7 @@ static int __init f71882fg_find(int sioaddr, unsigned short *address)
                 goto exit;
         }
 
-        devid = superio_inw(sioaddr, SIO_REG_DEVID);
+        devid = force_id ? force_id : superio_inw(sioaddr, SIO_REG_DEVID);
         if (devid != SIO_F71882_ID) {
                 printk(KERN_INFO DRVNAME ": Unsupported Fintek device\n");
                 goto exit;
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index ad6c8a319903..0932fd53352a 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -52,6 +52,10 @@
 
 enum chips { it87, it8712, it8716, it8718 };
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 static struct platform_device *pdev;
 
 #define REG     0x2e    /* The register to read/write */
@@ -906,7 +910,7 @@ static int __init it87_find(unsigned short *address,
         u16 chip_type;
 
         superio_enter();
-        chip_type = superio_inw(DEVID);
+        chip_type = force_id ? force_id : superio_inw(DEVID);
 
         switch (chip_type) {
         case IT8705F_DEVID:
diff --git a/drivers/hwmon/pc87360.c b/drivers/hwmon/pc87360.c
index 9d660133d517..9b462bb13fa3 100644
--- a/drivers/hwmon/pc87360.c
+++ b/drivers/hwmon/pc87360.c
@@ -59,6 +59,10 @@ MODULE_PARM_DESC(init,
  " 2: Forcibly enable all voltage and temperature channels, except in9\n"
  " 3: Forcibly enable all voltage and temperature channels, including in9");
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 /*
  * Super-I/O registers and operations
  */
@@ -826,7 +830,7 @@ static int __init pc87360_find(int sioaddr, u8 *devid, unsigned short *addresses
         /* No superio_enter */
 
         /* Identify device */
-        val = superio_inb(sioaddr, DEVID);
+        val = force_id ? force_id : superio_inb(sioaddr, DEVID);
         switch (val) {
         case 0xE1: /* PC87360 */
         case 0xE8: /* PC87363 */
diff --git a/drivers/hwmon/pc87427.c b/drivers/hwmon/pc87427.c
index d40509ad6ae6..7265f22ae5cd 100644
--- a/drivers/hwmon/pc87427.c
+++ b/drivers/hwmon/pc87427.c
@@ -34,6 +34,10 @@
 #include <linux/ioport.h>
 #include <asm/io.h>
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 static struct platform_device *pdev;
 
 #define DRVNAME "pc87427"
@@ -555,7 +559,7 @@ static int __init pc87427_find(int sioaddr, unsigned short *address)
         int i, err = 0;
 
         /* Identify device */
-        val = superio_inb(sioaddr, SIOREG_DEVID);
+        val = force_id ? force_id : superio_inb(sioaddr, SIOREG_DEVID);
         if (val != 0xf2) {      /* PC87427 */
                 err = -ENODEV;
                 goto exit;
diff --git a/drivers/hwmon/smsc47b397.c b/drivers/hwmon/smsc47b397.c
index 0b57d2ea2cf7..f61d8f4185b2 100644
--- a/drivers/hwmon/smsc47b397.c
+++ b/drivers/hwmon/smsc47b397.c
@@ -38,6 +38,10 @@
 #include <linux/mutex.h>
 #include <asm/io.h>
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 static struct platform_device *pdev;
 
 #define DRVNAME "smsc47b397"
@@ -333,7 +337,7 @@ static int __init smsc47b397_find(unsigned short *addr)
         u8 id, rev;
 
         superio_enter();
-        id = superio_inb(SUPERIO_REG_DEVID);
+        id = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
 
         if ((id != 0x6f) && (id != 0x81) && (id != 0x85)) {
                 superio_exit();
diff --git a/drivers/hwmon/smsc47m1.c b/drivers/hwmon/smsc47m1.c
index a10a380868e2..0d7f0c4d06bb 100644
--- a/drivers/hwmon/smsc47m1.c
+++ b/drivers/hwmon/smsc47m1.c
@@ -39,6 +39,10 @@
 #include <linux/sysfs.h>
 #include <asm/io.h>
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 static struct platform_device *pdev;
 
 #define DRVNAME "smsc47m1"
@@ -399,7 +403,7 @@ static int __init smsc47m1_find(unsigned short *addr,
         u8 val;
 
         superio_enter();
-        val = superio_inb(SUPERIO_REG_DEVID);
+        val = force_id ? force_id : superio_inb(SUPERIO_REG_DEVID);
 
         /*
          * SMSC LPC47M10x/LPC47M112/LPC47M13x (device id 0x59), LPC47M14x
diff --git a/drivers/hwmon/vt1211.c b/drivers/hwmon/vt1211.c
index 7dfcc8dd316d..12b43590fa53 100644
--- a/drivers/hwmon/vt1211.c
+++ b/drivers/hwmon/vt1211.c
@@ -42,6 +42,10 @@ static int int_mode = -1;
 module_param(int_mode, int, 0);
 MODULE_PARM_DESC(int_mode, "Force the temperature interrupt mode");
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 static struct platform_device *pdev;
 
 #define DRVNAME "vt1211"
@@ -1280,10 +1284,12 @@ EXIT:
 static int __init vt1211_find(int sio_cip, unsigned short *address)
 {
         int err = -ENODEV;
+        int devid;
 
         superio_enter(sio_cip);
 
-        if (superio_inb(sio_cip, SIO_VT1211_DEVID) != SIO_VT1211_ID) {
+        devid = force_id ? force_id : superio_inb(sio_cip, SIO_VT1211_DEVID);
+        if (devid != SIO_VT1211_ID) {
                 goto EXIT;
         }
 
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
index d5aa25ce5dbd..699592855bd8 100644
--- a/drivers/hwmon/w83627ehf.c
+++ b/drivers/hwmon/w83627ehf.c
@@ -59,6 +59,10 @@ static const char * w83627ehf_device_names[] = {
         "w83627dhg",
 };
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 #define DRVNAME "w83627ehf"
 
 /*
@@ -1445,8 +1449,11 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
 
         superio_enter(sioaddr);
 
-        val = (superio_inb(sioaddr, SIO_REG_DEVID) << 8)
-            | superio_inb(sioaddr, SIO_REG_DEVID + 1);
+        if (force_id)
+                val = force_id;
+        else
+                val = (superio_inb(sioaddr, SIO_REG_DEVID) << 8)
+                    | superio_inb(sioaddr, SIO_REG_DEVID + 1);
         switch (val & SIO_ID_MASK) {
         case SIO_W83627EHF_ID:
                 sio_data->kind = w83627ehf;
diff --git a/drivers/hwmon/w83627hf.c b/drivers/hwmon/w83627hf.c
index 879d0a6544cc..181f4e8590b1 100644
--- a/drivers/hwmon/w83627hf.c
+++ b/drivers/hwmon/w83627hf.c
@@ -75,6 +75,10 @@ static int init = 1;
 module_param(init, bool, 0);
 MODULE_PARM_DESC(init, "Set to zero to bypass chip initialization");
 
+static unsigned short force_id;
+module_param(force_id, ushort, 0);
+MODULE_PARM_DESC(force_id, "Override the detected device ID");
+
 /* modified from kernel/include/traps.c */
 static int REG;         /* The register to read/write */
 #define DEV     0x07    /* Register: Logical device select */
@@ -1014,7 +1018,7 @@ static int __init w83627hf_find(int sioaddr, unsigned short *addr,
         VAL = sioaddr + 1;
 
         superio_enter();
-        val= superio_inb(DEVID);
+        val = force_id ? force_id : superio_inb(DEVID);
         switch (val) {
         case W627_DEVID:
                 sio_data->type = w83627hf;