Skip to content
Snippets Groups Projects
Commit 9076e0ca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Pull hwmon updates from Jean Delvare:
 "This include it87 driver improvements, and a tree-wide change of my
  e-mail address"

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  Update Jean Delvare's e-mail address
  hwmon: (it87) Print proper names for the IT8771E and IT8772E
  hwmon: (it87) Add support for the ITE IT8603E
parents b7a8399e 7c81c60f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 40 additions and 29 deletions
CREDITS
+ 2
− 2
View file @ 9076e0ca
......@@ -823,8 +823,8 @@ S: D-69231 Rauenberg
S: Germany
N: Jean Delvare
E: khali@linux-fr.org
W: http://khali.linux-fr.org/
E: jdelvare@suse.de
W: http://jdelvare.nerim.net/
D: Several hardware monitoring drivers
S: France
......
Documentation/hwmon/adm1025
+ 1
− 1
View file @ 9076e0ca
......@@ -18,7 +18,7 @@ The NE1619 presents some differences with the original ADM1025:
Authors:
Chen-Yuan Wu <gwu@esoft.com>,
Jean Delvare <khali@linux-fr.org>
Jean Delvare <jdelvare@suse.de>
Description
-----------
......
Documentation/hwmon/adm1031
+ 1
− 1
View file @ 9076e0ca
......@@ -16,7 +16,7 @@ Supported chips:
Authors:
Alexandre d'Alton <alex@alexdalton.org>
Jean Delvare <khali@linux-fr.org>
Jean Delvare <jdelvare@suse.de>
Description
-----------
......
Documentation/hwmon/adm9240
+ 1
− 1
View file @ 9076e0ca
......@@ -25,7 +25,7 @@ Authors:
Philip Edelbrock <phil@netroedge.com>,
Michiel Rook <michiel@grendelproject.nl>,
Grant Coady <gcoady.lk@gmail.com> with guidance
from Jean Delvare <khali@linux-fr.org>
from Jean Delvare <jdelvare@suse.de>
Interface
---------
......
Documentation/hwmon/ds1621
+ 1
− 1
View file @ 9076e0ca
......@@ -31,7 +31,7 @@ Authors:
Christian W. Zuckschwerdt <zany@triq.net>
valuable contributions by Jan M. Sendler <sendler@sendler.de>
ported to 2.6 by Aurelien Jarno <aurelien@aurel32.net>
with the help of Jean Delvare <khali@linux-fr.org>
with the help of Jean Delvare <jdelvare@suse.de>
Module Parameters
------------------
......
Documentation/hwmon/emc6w201
+ 1
− 1
View file @ 9076e0ca
......@@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: I2C 0x2c, 0x2d, 0x2e
Datasheet: Not public
Author: Jean Delvare <khali@linux-fr.org>
Author: Jean Delvare <jdelvare@suse.de>
Description
......
Documentation/hwmon/f71805f
+ 1
− 1
View file @ 9076e0ca
......@@ -15,7 +15,7 @@ Supported chips:
Addresses scanned: none, address read from Super I/O config space
Datasheet: Available from the Fintek website
Author: Jean Delvare <khali@linux-fr.org>
Author: Jean Delvare <jdelvare@suse.de>
Thanks to Denis Kieft from Barracuda Networks for the donation of a
test system (custom Jetway K8M8MS motherboard, with CPU and RAM) and
......
Documentation/hwmon/gl518sm
+ 1
− 1
View file @ 9076e0ca
......@@ -14,7 +14,7 @@ Authors:
Frodo Looijaard <frodol@dds.nl>,
Kyösti Mälkki <kmalkki@cc.hut.fi>
Hong-Gunn Chew <hglinux@gunnet.org>
Jean Delvare <khali@linux-fr.org>
Jean Delvare <jdelvare@suse.de>
Description
-----------
......
Documentation/hwmon/it87
+ 20
− 9
View file @ 9076e0ca
......@@ -2,6 +2,10 @@ Kernel driver it87
==================
Supported chips:
* IT8603E
Prefix: 'it8603'
Addresses scanned: from Super I/O config space (8 I/O ports)
Datasheet: Not publicly available
* IT8705F
Prefix: 'it87'
Addresses scanned: from Super I/O config space (8 I/O ports)
......@@ -53,7 +57,7 @@ Supported chips:
Authors:
Christophe Gauthron
Jean Delvare <khali@linux-fr.org>
Jean Delvare <jdelvare@suse.de>
Module Parameters
......@@ -90,7 +94,7 @@ motherboard models.
Description
-----------
This driver implements support for the IT8705F, IT8712F, IT8716F,
This driver implements support for the IT8603E, IT8705F, IT8712F, IT8716F,
IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E, IT8771E, IT8772E,
IT8782F, IT8783E/F, and SiS950 chips.
......@@ -129,6 +133,10 @@ to userspace applications.
The IT8728F, IT8771E, and IT8772E are considered compatible with the IT8721F,
until a datasheet becomes available (hopefully.)
The IT8603E is a custom design, hardware monitoring part is similar to
IT8728F. It only supports 16-bit fan mode, the full speed mode of the
fan is not supported (value 0 of pwmX_enable).
Temperatures are measured in degrees Celsius. An alarm is triggered once
when the Overtemperature Shutdown limit is crossed.
......@@ -145,13 +153,16 @@ alarm is triggered if the voltage has crossed a programmable minimum or
maximum limit. Note that minimum in this case always means 'closest to
zero'; this is important for negative voltage measurements. All voltage
inputs can measure voltages between 0 and 4.08 volts, with a resolution of
0.016 volt (except IT8721F/IT8758E and IT8728F: 0.012 volt.) The battery
voltage in8 does not have limit registers.
On the IT8721F/IT8758E, IT8782F, and IT8783E/F, some voltage inputs are
internal and scaled inside the chip (in7 (optional for IT8782F and IT8783E/F),
in8 and optionally in3). The driver handles this transparently so user-space
doesn't have to care.
0.016 volt (except IT8603E, IT8721F/IT8758E and IT8728F: 0.012 volt.) The
battery voltage in8 does not have limit registers.
On the IT8603E, IT8721F/IT8758E, IT8782F, and IT8783E/F, some voltage inputs
are internal and scaled inside the chip:
* in3 (optional)
* in7 (optional for IT8782F and IT8783E/F)
* in8 (always)
* in9 (relevant for IT8603E only)
The driver handles this transparently so user-space doesn't have to care.
The VID lines (IT8712F/IT8716F/IT8718F/IT8720F) encode the core voltage value:
the voltage level your processor should work with. This is hardcoded by
......
Documentation/hwmon/lm63
+ 1
− 1
View file @ 9076e0ca
......@@ -18,7 +18,7 @@ Supported chips:
Datasheet: Publicly available at the National Semiconductor website
http://www.national.com/pf/LM/LM96163.html
Author: Jean Delvare <khali@linux-fr.org>
Author: Jean Delvare <jdelvare@suse.de>
Thanks go to Tyan and especially Alex Buckingham for setting up a remote
access to their S4882 test platform for this driver.
......
Documentation/hwmon/lm70
+ 1
− 1
View file @ 9076e0ca
......@@ -43,5 +43,5 @@ data (0.03125 degrees celsius resolution).
Thanks to
---------
Jean Delvare <khali@linux-fr.org> for mentoring the hwmon-side driver
Jean Delvare <jdelvare@suse.de> for mentoring the hwmon-side driver
development.
Documentation/hwmon/lm78
+ 1
− 1
View file @ 9076e0ca
......@@ -14,7 +14,7 @@ Supported chips:
http://www.national.com/
Authors: Frodo Looijaard <frodol@dds.nl>
Jean Delvare <khali@linux-fr.org>
Jean Delvare <jdelvare@suse.de>
Description
-----------
......
Documentation/hwmon/lm83
+ 1
− 1
View file @ 9076e0ca
......@@ -13,7 +13,7 @@ Supported chips:
http://www.national.com/pf/LM/LM82.html
Author: Jean Delvare <khali@linux-fr.org>
Author: Jean Delvare <jdelvare@suse.de>
Description
-----------
......
Documentation/hwmon/lm87
+ 1
− 1
View file @ 9076e0ca
......@@ -17,7 +17,7 @@ Authors:
Mark Studebaker <mdsxyz123@yahoo.com>,
Stephen Rousset <stephen.rousset@rocketlogix.com>,
Dan Eaton <dan.eaton@rocketlogix.com>,
Jean Delvare <khali@linux-fr.org>,
Jean Delvare <jdelvare@suse.de>,
Original 2.6 port Jeff Oliver
Description
......
Documentation/hwmon/lm90
+ 1
− 1
View file @ 9076e0ca
......@@ -129,7 +129,7 @@ Supported chips:
http://www.ti.com/litv/pdf/sbos686
Author: Jean Delvare <khali@linux-fr.org>
Author: Jean Delvare <jdelvare@suse.de>
Description
......
Documentation/hwmon/lm92
+ 1
− 1
View file @ 9076e0ca
......@@ -19,7 +19,7 @@ Supported chips:
Authors:
Abraham van der Merwe <abraham@2d3d.co.za>
Jean Delvare <khali@linux-fr.org>
Jean Delvare <jdelvare@suse.de>
Description
......
Documentation/hwmon/max1619
+ 1
− 1
View file @ 9076e0ca
......@@ -10,7 +10,7 @@ Supported chips:
Authors:
Oleksij Rempel <bug-track@fisher-privat.net>,
Jean Delvare <khali@linux-fr.org>
Jean Delvare <jdelvare@suse.de>
Description
-----------
......
Documentation/hwmon/pc87360
+ 1
− 1
View file @ 9076e0ca
......@@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: none, address read from Super I/O config space
Datasheets: No longer available
Authors: Jean Delvare <khali@linux-fr.org>
Authors: Jean Delvare <jdelvare@suse.de>
Thanks to Sandeep Mehta, Tonko de Rooy and Daniel Ceregatti for testing.
Thanks to Rudolf Marek for helping me investigate conversion issues.
......
Documentation/hwmon/pc87427
+ 1
− 1
View file @ 9076e0ca
......@@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: none, address read from Super I/O config space
Datasheet: No longer available
Author: Jean Delvare <khali@linux-fr.org>
Author: Jean Delvare <jdelvare@suse.de>
Thanks to Amir Habibi at Candelis for setting up a test system, and to
Michael Kress for testing several iterations of this driver.
......
Documentation/hwmon/pcf8591
+ 1
− 1
View file @ 9076e0ca
......@@ -11,7 +11,7 @@ Supported chips:
Authors:
Aurelien Jarno <aurelien@aurel32.net>
valuable contributions by Jan M. Sendler <sendler@sendler.de>,
Jean Delvare <khali@linux-fr.org>
Jean Delvare <jdelvare@suse.de>
Description
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment