Skip to content

Commit

Permalink
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
torvalds committed Jan 30, 2014
2 parents b7a8399 + 7c81c60 commit 9076e0c
Show file tree
Hide file tree
Showing 79 changed files with 225 additions and 148 deletions.
4 changes: 2 additions & 2 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -823,8 +823,8 @@ S: D-69231 Rauenberg
S: Germany

N: Jean Delvare
E: [email protected]
W: http://khali.linux-fr.org/
E: [email protected]
W: http://jdelvare.nerim.net/
D: Several hardware monitoring drivers
S: France

Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/adm1025
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The NE1619 presents some differences with the original ADM1025:

Authors:
Chen-Yuan Wu <[email protected]>,
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>

Description
-----------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/adm1031
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Supported chips:

Authors:
Alexandre d'Alton <[email protected]>
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>

Description
-----------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/adm9240
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Authors:
Philip Edelbrock <[email protected]>,
Michiel Rook <[email protected]>,
Grant Coady <[email protected]> with guidance
from Jean Delvare <[email protected]>
from Jean Delvare <[email protected]>

Interface
---------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/ds1621
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Authors:
Christian W. Zuckschwerdt <[email protected]>
valuable contributions by Jan M. Sendler <[email protected]>
ported to 2.6 by Aurelien Jarno <[email protected]>
with the help of Jean Delvare <[email protected]>
with the help of Jean Delvare <[email protected]>

Module Parameters
------------------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/emc6w201
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: I2C 0x2c, 0x2d, 0x2e
Datasheet: Not public

Author: Jean Delvare <[email protected]>
Author: Jean Delvare <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/f71805f
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Author: Jean Delvare <[email protected]>

Thanks to Denis Kieft from Barracuda Networks for the donation of a
test system (custom Jetway K8M8MS motherboard, with CPU and RAM) and
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/gl518sm
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Authors:
Frodo Looijaard <[email protected]>,
Kyösti Mälkki <[email protected]>
Hong-Gunn Chew <[email protected]>
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>

Description
-----------
Expand Down
29 changes: 20 additions & 9 deletions Documentation/hwmon/it87
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -53,7 +57,7 @@ Supported chips:

Authors:
Christophe Gauthron
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>


Module Parameters
Expand Down Expand Up @@ -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.

Expand Down Expand Up @@ -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.

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm63
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>
Author: Jean Delvare <[email protected]>

Thanks go to Tyan and especially Alex Buckingham for setting up a remote
access to their S4882 test platform for this driver.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm70
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ data (0.03125 degrees celsius resolution).

Thanks to
---------
Jean Delvare <[email protected]> for mentoring the hwmon-side driver
Jean Delvare <[email protected]> for mentoring the hwmon-side driver
development.
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm78
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Supported chips:
http://www.national.com/

Authors: Frodo Looijaard <[email protected]>
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>

Description
-----------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm83
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Supported chips:
http://www.national.com/pf/LM/LM82.html


Author: Jean Delvare <[email protected]>
Author: Jean Delvare <[email protected]>

Description
-----------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm87
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Authors:
Mark Studebaker <[email protected]>,
Stephen Rousset <[email protected]>,
Dan Eaton <[email protected]>,
Jean Delvare <[email protected]>,
Jean Delvare <[email protected]>,
Original 2.6 port Jeff Oliver

Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm90
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ Supported chips:
http://www.ti.com/litv/pdf/sbos686


Author: Jean Delvare <[email protected]>
Author: Jean Delvare <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm92
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Supported chips:

Authors:
Abraham van der Merwe <[email protected]>
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/max1619
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Supported chips:

Authors:
Oleksij Rempel <[email protected]>,
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>

Description
-----------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/pc87360
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: none, address read from Super I/O config space
Datasheets: No longer available

Authors: Jean Delvare <[email protected]>
Authors: Jean Delvare <[email protected]>

Thanks to Sandeep Mehta, Tonko de Rooy and Daniel Ceregatti for testing.
Thanks to Rudolf Marek for helping me investigate conversion issues.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/pc87427
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: none, address read from Super I/O config space
Datasheet: No longer available

Author: Jean Delvare <[email protected]>
Author: Jean Delvare <[email protected]>

Thanks to Amir Habibi at Candelis for setting up a test system, and to
Michael Kress for testing several iterations of this driver.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/pcf8591
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Supported chips:
Authors:
Aurelien Jarno <[email protected]>
valuable contributions by Jan M. Sendler <[email protected]>,
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>


Description
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/smsc47m1
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Authors:
With assistance from Bruce Allen <[email protected]>, and his
fan.c program: http://www.lsc-group.phys.uwm.edu/%7Eballen/driver/
Gabriele Gorla <[email protected]>,
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>

Description
-----------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/w83627ehf
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Supported chips:
Datasheet: Available from Nuvoton upon request

Authors:
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>
Yuan Mu (Winbond)
Rudolf Marek <[email protected]>
David Hubbard <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/w83795
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Supported chips:

Authors:
Wei Song (Nuvoton)
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>


Pin mapping
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/w83l785ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Supported chips:
http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83L785TS-S.pdf

Authors:
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>

Description
-----------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/i2c/busses/i2c-i801
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ and the additional 'Integrated Device Function' controllers are supported.

Authors:
Mark Studebaker <[email protected]>
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>


Module Parameters
Expand Down
2 changes: 1 addition & 1 deletion Documentation/i2c/busses/i2c-parport
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Kernel driver i2c-parport

Author: Jean Delvare <[email protected]>
Author: Jean Delvare <[email protected]>

This is a unified driver for several i2c-over-parallel-port adapters,
such as the ones made by Philips, Velleman or ELV. This driver is
Expand Down
2 changes: 1 addition & 1 deletion Documentation/i2c/busses/i2c-parport-light
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Kernel driver i2c-parport-light

Author: Jean Delvare <[email protected]>
Author: Jean Delvare <[email protected]>

This driver is a light version of i2c-parport. It doesn't depend
on the parport driver, and uses direct I/O access instead. This might be
Expand Down
2 changes: 1 addition & 1 deletion Documentation/i2c/busses/i2c-taos-evm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Kernel driver i2c-taos-evm

Author: Jean Delvare <[email protected]>
Author: Jean Delvare <[email protected]>

This is a driver for the evaluation modules for TAOS I2C/SMBus chips.
The modules include an SMBus master with limited capabilities, which can
Expand Down
2 changes: 1 addition & 1 deletion Documentation/i2c/busses/i2c-viapro
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Supported adapters:
Authors:
Kyösti Mälkki <[email protected]>,
Mark D. Studebaker <[email protected]>,
Jean Delvare <[email protected]>
Jean Delvare <[email protected]>

Module Parameters
-----------------
Expand Down
2 changes: 1 addition & 1 deletion Documentation/misc-devices/eeprom
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Supported chips:
Authors:
Frodo Looijaard <[email protected]>,
Philip Edelbrock <[email protected]>,
Jean Delvare <[email protected]>,
Jean Delvare <[email protected]>,
Greg Kroah-Hartman <[email protected]>,
IBM Corp.

Expand Down
Loading

0 comments on commit 9076e0c

Please sign in to comment.