aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuerg Haefliger <juergh@gmail.com>2008-04-04 00:34:19 -0400
committerMark M. Hoffman <mhoffman@lightlink.com>2008-07-31 23:44:02 -0400
commit92430b6feb19aba043171ff3094535b598052901 (patch)
treebf423e463d09aa4c08bcb529850e1cf8877c2c41
parent9b257714a3f6f5c3ea133c44d3442e2340734b65 (diff)
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
22 and PWM output control functions. Using this parameter 22 and PWM output control functions. Using this parameter
23 shouldn't be required since the BIOS usually takes care 23 shouldn't be required since the BIOS usually takes care
24 of this. 24 of this.
25* probe_all_addr: bool Include non-standard LPC addresses 0x162e and 0x164e
26 when probing for ISA devices. This is required for the
27 following boards:
28 - VIA EPIA SN18000
25 29
26Note that there is no need to use this parameter if the driver loads without 30Note that there is no need to use this parameter if the driver loads without
27complaining. The driver will say so if it is necessary. 31complaining. 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;
48module_param(force_id, ushort, 0); 48module_param(force_id, ushort, 0);
49MODULE_PARM_DESC(force_id, "Override the detected device ID"); 49MODULE_PARM_DESC(force_id, "Override the detected device ID");
50 50
51static int probe_all_addr;
52module_param(probe_all_addr, bool, 0);
53MODULE_PARM_DESC(probe_all_addr, "Include probing of non-standard LPC "
54 "addresses");
55
51/* Addresses to scan */ 56/* Addresses to scan */
52static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END}; 57static const unsigned short normal_i2c[] = {0x2c, 0x2d, 0x2e, I2C_CLIENT_END};
53 58
@@ -2430,7 +2435,10 @@ static int __init dme1737_init(void)
2430 } 2435 }
2431 2436
2432 if (dme1737_isa_detect(0x2e, &addr) && 2437 if (dme1737_isa_detect(0x2e, &addr) &&
2433 dme1737_isa_detect(0x4e, &addr)) { 2438 dme1737_isa_detect(0x4e, &addr) &&
2439 (!probe_all_addr ||
2440 (dme1737_isa_detect(0x162e, &addr) &&
2441 dme1737_isa_detect(0x164e, &addr)))) {
2434 /* Return 0 if we didn't find an ISA device */ 2442 /* Return 0 if we didn't find an ISA device */
2435 return 0; 2443 return 0;
2436 } 2444 }