summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuerg Haefliger <juergh@gmail.com>2008-04-04 06:34:19 +0200
committerMark M. Hoffman <mhoffman@lightlink.com>2008-08-01 05:44:02 +0200
commit92430b6feb19aba043171ff3094535b598052901 (patch)
treebf423e463d09aa4c08bcb529850e1cf8877c2c41
parenthwmon: (dme1737) demacrofy for readability (diff)
downloadlinux-92430b6feb19aba043171ff3094535b598052901.tar.xz
linux-92430b6feb19aba043171ff3094535b598052901.zip
hwmon: (dme1737) probe all addresses
This patch adds a module load parameter to enable probing of non-standard LPC addresses 0x162e and 0x164e when scanning for supported ISA chips. Signed-Off-By: Juerg Haefliger <juergh at gmail.com> Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
-rw-r--r--Documentation/hwmon/dme17374
-rw-r--r--drivers/hwmon/dme1737.c10
2 files changed, 13 insertions, 1 deletions
diff --git a/Documentation/hwmon/dme1737 b/Documentation/hwmon/dme1737
index 8f446070e64a..b1fe00999439 100644
--- a/Documentation/hwmon/dme1737
+++ b/Documentation/hwmon/dme1737
@@ -22,6 +22,10 @@ Module Parameters
and PWM output control functions. Using this parameter
shouldn't be required since the BIOS usually takes care
of this.
+* probe_all_addr: bool Include non-standard LPC addresses 0x162e and 0x164e
+ when probing for ISA devices. This is required for the
+ following boards:
+ - VIA EPIA SN18000
Note that there is no need to use this parameter if the driver loads without
complaining. The driver will say so if it is necessary.
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index c24b5b370daa..5a3d41fbdb3c 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -48,6 +48,11 @@ static unsigned short force_id;
module_param(force_id, ushort, 0);
MODULE_PARM_DESC(force_id, "Override the detected device ID");
+static int probe_all_addr;
+module_param(probe_all_addr, bool, 0);
+MODULE_PARM_DESC(probe_all_addr, "Include probing of non-standard LPC "
+ "addresses");
+
/* Addresses to scan */
static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
@@ -2430,7 +2435,10 @@ static int __init dme1737_init(void)
}
if (dme1737_isa_detect(0x2e, &addr) &&
- dme1737_isa_detect(0x4e, &addr)) {
+ dme1737_isa_detect(0x4e, &addr) &&
+ (!probe_all_addr ||
+ (dme1737_isa_detect(0x162e, &addr) &&
+ dme1737_isa_detect(0x164e, &addr)))) {
/* Return 0 if we didn't find an ISA device */
return 0;
}