aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/hwmon/f71805f7
-rw-r--r--drivers/hwmon/Kconfig6
-rw-r--r--drivers/hwmon/f71805f.c5
3 files changed, 14 insertions, 4 deletions
diff --git a/Documentation/hwmon/f71805f b/Documentation/hwmon/f71805f
index 94e0d2cbd3d2..f0d55976740a 100644
--- a/Documentation/hwmon/f71805f
+++ b/Documentation/hwmon/f71805f
@@ -6,6 +6,10 @@ Supported chips:
6 Prefix: 'f71805f' 6 Prefix: 'f71805f'
7 Addresses scanned: none, address read from Super I/O config space 7 Addresses scanned: none, address read from Super I/O config space
8 Datasheet: Available from the Fintek website 8 Datasheet: Available from the Fintek website
9 * Fintek F71806F/FG
10 Prefix: 'f71872f'
11 Addresses scanned: none, address read from Super I/O config space
12 Datasheet: Available from the Fintek website
9 * Fintek F71872F/FG 13 * Fintek F71872F/FG
10 Prefix: 'f71872f' 14 Prefix: 'f71872f'
11 Addresses scanned: none, address read from Super I/O config space 15 Addresses scanned: none, address read from Super I/O config space
@@ -38,6 +42,9 @@ The Fintek F71872F/FG Super I/O chip is almost the same, with two
38additional internal voltages monitored (VSB and battery). It also features 42additional internal voltages monitored (VSB and battery). It also features
396 VID inputs. The VID inputs are not yet supported by this driver. 436 VID inputs. The VID inputs are not yet supported by this driver.
40 44
45The Fintek F71806F/FG Super-I/O chip is essentially the same as the
46F71872F/FG, and is undistinguishable therefrom.
47
41The driver assumes that no more than one chip is present, which seems 48The driver assumes that no more than one chip is present, which seems
42reasonable. 49reasonable.
43 50
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 192953b29b28..2aeec4787e5f 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -206,12 +206,12 @@ config SENSORS_DS1621
206 will be called ds1621. 206 will be called ds1621.
207 207
208config SENSORS_F71805F 208config SENSORS_F71805F
209 tristate "Fintek F71805F/FG and F71872F/FG" 209 tristate "Fintek F71805F/FG, F71806F/FG and F71872F/FG"
210 depends on EXPERIMENTAL 210 depends on EXPERIMENTAL
211 help 211 help
212 If you say yes here you get support for hardware monitoring 212 If you say yes here you get support for hardware monitoring
213 features of the Fintek F71805F/FG and F71872F/FG Super-I/O 213 features of the Fintek F71805F/FG, F71806F/FG and F71872F/FG
214 chips. 214 Super-I/O chips.
215 215
216 This driver can also be built as a module. If so, the module 216 This driver can also be built as a module. If so, the module
217 will be called f71805f. 217 will be called f71805f.
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 6f60715f34f8..1cd71a5be0ea 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -10,6 +10,9 @@
10 * The F71872F/FG is almost the same, with two more voltages monitored, 10 * The F71872F/FG is almost the same, with two more voltages monitored,
11 * and 6 VID inputs. 11 * and 6 VID inputs.
12 * 12 *
13 * The F71806F/FG is essentially the same as the F71872F/FG. It even has
14 * the same chip ID, so the driver can't differentiate between.
15 *
13 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
14 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
15 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
@@ -1485,7 +1488,7 @@ static int __init f71805f_find(int sioaddr, unsigned short *address,
1485 1488
1486 static const char *names[] = { 1489 static const char *names[] = {
1487 "F71805F/FG", 1490 "F71805F/FG",
1488 "F71872F/FG", 1491 "F71872F/FG or F71806F/FG",
1489 }; 1492 };
1490 1493
1491 superio_enter(sioaddr); 1494 superio_enter(sioaddr);