iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds 2014-01-29 18:56:27 -08:00
commit 9076e0cae7
79 changed files with 224 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CREDITS
View File

@ -823,8 +823,8 @@ S: D-69231 Rauenberg
S: Germany S: Germany
N: Jean Delvare N: Jean Delvare
E: khali@linux-fr.org E: jdelvare@suse.de
W: http://khali.linux-fr.org/ W: http://jdelvare.nerim.net/
D: Several hardware monitoring drivers D: Several hardware monitoring drivers
S: France S: France

2
Documentation/hwmon/adm1025
View File

@ -18,7 +18,7 @@ The NE1619 presents some differences with the original ADM1025:
Authors: Authors:
Chen-Yuan Wu <gwu@esoft.com>, Chen-Yuan Wu <gwu@esoft.com>,
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Description Description
----------- -----------

2
Documentation/hwmon/adm1031
View File

@ -16,7 +16,7 @@ Supported chips:
Authors: Authors:
Alexandre d'Alton <alex@alexdalton.org> Alexandre d'Alton <alex@alexdalton.org>
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Description Description
----------- -----------

2
Documentation/hwmon/adm9240
View File

@ -25,7 +25,7 @@ Authors:
Philip Edelbrock <phil@netroedge.com>, Philip Edelbrock <phil@netroedge.com>,
Michiel Rook <michiel@grendelproject.nl>, Michiel Rook <michiel@grendelproject.nl>,
Grant Coady <gcoady.lk@gmail.com> with guidance Grant Coady <gcoady.lk@gmail.com> with guidance
from Jean Delvare <khali@linux-fr.org> from Jean Delvare <jdelvare@suse.de>
Interface Interface
--------- ---------

2
Documentation/hwmon/ds1621
View File

@ -31,7 +31,7 @@ Authors:
Christian W. Zuckschwerdt <zany@triq.net> Christian W. Zuckschwerdt <zany@triq.net>
valuable contributions by Jan M. Sendler <sendler@sendler.de> valuable contributions by Jan M. Sendler <sendler@sendler.de>
ported to 2.6 by Aurelien Jarno <aurelien@aurel32.net> 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 Module Parameters
------------------ ------------------

2
Documentation/hwmon/emc6w201
View File

@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: I2C 0x2c, 0x2d, 0x2e Addresses scanned: I2C 0x2c, 0x2d, 0x2e
Datasheet: Not public Datasheet: Not public
Author: Jean Delvare <khali@linux-fr.org> Author: Jean Delvare <jdelvare@suse.de>
Description Description

2
Documentation/hwmon/f71805f
View File

@ -15,7 +15,7 @@ Supported chips:
Addresses scanned: none, address read from Super I/O config space Addresses scanned: none, address read from Super I/O config space
Datasheet: Available from the Fintek website 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 Thanks to Denis Kieft from Barracuda Networks for the donation of a
test system (custom Jetway K8M8MS motherboard, with CPU and RAM) and test system (custom Jetway K8M8MS motherboard, with CPU and RAM) and

2
Documentation/hwmon/gl518sm
View File

@ -14,7 +14,7 @@ Authors:
Frodo Looijaard <frodol@dds.nl>, Frodo Looijaard <frodol@dds.nl>,
Kyösti Mälkki <kmalkki@cc.hut.fi> Kyösti Mälkki <kmalkki@cc.hut.fi>
Hong-Gunn Chew <hglinux@gunnet.org> Hong-Gunn Chew <hglinux@gunnet.org>
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Description Description
----------- -----------

27
Documentation/hwmon/it87
View File

@ -2,6 +2,10 @@ Kernel driver it87
================== ==================
Supported chips: Supported chips:
* IT8603E
Prefix: 'it8603'
Addresses scanned: from Super I/O config space (8 I/O ports)
Datasheet: Not publicly available
* IT8705F * IT8705F
Prefix: 'it87' Prefix: 'it87'
Addresses scanned: from Super I/O config space (8 I/O ports) Addresses scanned: from Super I/O config space (8 I/O ports)
@ -53,7 +57,7 @@ Supported chips:
Authors: Authors:
Christophe Gauthron Christophe Gauthron
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Module Parameters Module Parameters
@ -90,7 +94,7 @@ motherboard models.
Description 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, IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E, IT8771E, IT8772E,
IT8782F, IT8783E/F, and SiS950 chips. IT8782F, IT8783E/F, and SiS950 chips.
@ -129,6 +133,10 @@ to userspace applications.
The IT8728F, IT8771E, and IT8772E are considered compatible with the IT8721F, The IT8728F, IT8771E, and IT8772E are considered compatible with the IT8721F,
until a datasheet becomes available (hopefully.) 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 Temperatures are measured in degrees Celsius. An alarm is triggered once
when the Overtemperature Shutdown limit is crossed. 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 maximum limit. Note that minimum in this case always means 'closest to
zero'; this is important for negative voltage measurements. All voltage zero'; this is important for negative voltage measurements. All voltage
inputs can measure voltages between 0 and 4.08 volts, with a resolution of 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 0.016 volt (except IT8603E, IT8721F/IT8758E and IT8728F: 0.012 volt.) The
voltage in8 does not have limit registers. battery voltage in8 does not have limit registers.
On the IT8721F/IT8758E, IT8782F, and IT8783E/F, some voltage inputs are On the IT8603E, IT8721F/IT8758E, IT8782F, and IT8783E/F, some voltage inputs
internal and scaled inside the chip (in7 (optional for IT8782F and IT8783E/F), are internal and scaled inside the chip:
in8 and optionally in3). The driver handles this transparently so user-space * in3 (optional)
doesn't have to care. * 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 VID lines (IT8712F/IT8716F/IT8718F/IT8720F) encode the core voltage value:
the voltage level your processor should work with. This is hardcoded by the voltage level your processor should work with. This is hardcoded by

2
Documentation/hwmon/lm63
View File

@ -18,7 +18,7 @@ Supported chips:
Datasheet: Publicly available at the National Semiconductor website Datasheet: Publicly available at the National Semiconductor website
http://www.national.com/pf/LM/LM96163.html 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 Thanks go to Tyan and especially Alex Buckingham for setting up a remote
access to their S4882 test platform for this driver. access to their S4882 test platform for this driver.

2
Documentation/hwmon/lm70
View File

@ -43,5 +43,5 @@ data (0.03125 degrees celsius resolution).
Thanks to 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. development.

2
Documentation/hwmon/lm78
View File

@ -14,7 +14,7 @@ Supported chips:
http://www.national.com/ http://www.national.com/
Authors: Frodo Looijaard <frodol@dds.nl> Authors: Frodo Looijaard <frodol@dds.nl>
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Description Description
----------- -----------

2
Documentation/hwmon/lm83
View File

@ -13,7 +13,7 @@ Supported chips:
http://www.national.com/pf/LM/LM82.html http://www.national.com/pf/LM/LM82.html
Author: Jean Delvare <khali@linux-fr.org> Author: Jean Delvare <jdelvare@suse.de>
Description Description
----------- -----------

2
Documentation/hwmon/lm87
View File

@ -17,7 +17,7 @@ Authors:
Mark Studebaker <mdsxyz123@yahoo.com>, Mark Studebaker <mdsxyz123@yahoo.com>,
Stephen Rousset <stephen.rousset@rocketlogix.com>, Stephen Rousset <stephen.rousset@rocketlogix.com>,
Dan Eaton <dan.eaton@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 Original 2.6 port Jeff Oliver
Description Description

2
Documentation/hwmon/lm90
View File

@ -129,7 +129,7 @@ Supported chips:
http://www.ti.com/litv/pdf/sbos686 http://www.ti.com/litv/pdf/sbos686
Author: Jean Delvare <khali@linux-fr.org> Author: Jean Delvare <jdelvare@suse.de>
Description Description

2
Documentation/hwmon/lm92
View File

@ -19,7 +19,7 @@ Supported chips:
Authors: Authors:
Abraham van der Merwe <abraham@2d3d.co.za> Abraham van der Merwe <abraham@2d3d.co.za>
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Description Description

2
Documentation/hwmon/max1619
View File

@ -10,7 +10,7 @@ Supported chips:
Authors: Authors:
Oleksij Rempel <bug-track@fisher-privat.net>, Oleksij Rempel <bug-track@fisher-privat.net>,
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Description Description
----------- -----------

2
Documentation/hwmon/pc87360
View File

@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: none, address read from Super I/O config space Addresses scanned: none, address read from Super I/O config space
Datasheets: No longer available 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 Sandeep Mehta, Tonko de Rooy and Daniel Ceregatti for testing.
Thanks to Rudolf Marek for helping me investigate conversion issues. Thanks to Rudolf Marek for helping me investigate conversion issues.

2
Documentation/hwmon/pc87427
View File

@ -7,7 +7,7 @@ Supported chips:
Addresses scanned: none, address read from Super I/O config space Addresses scanned: none, address read from Super I/O config space
Datasheet: No longer available 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 Thanks to Amir Habibi at Candelis for setting up a test system, and to
Michael Kress for testing several iterations of this driver. Michael Kress for testing several iterations of this driver.

2
Documentation/hwmon/pcf8591
View File

@ -11,7 +11,7 @@ Supported chips:
Authors: Authors:
Aurelien Jarno <aurelien@aurel32.net> Aurelien Jarno <aurelien@aurel32.net>
valuable contributions by Jan M. Sendler <sendler@sendler.de>, valuable contributions by Jan M. Sendler <sendler@sendler.de>,
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Description Description

2
Documentation/hwmon/smsc47m1
View File

@ -25,7 +25,7 @@ Authors:
With assistance from Bruce Allen <ballen@uwm.edu>, and his With assistance from Bruce Allen <ballen@uwm.edu>, and his
fan.c program: http://www.lsc-group.phys.uwm.edu/%7Eballen/driver/ fan.c program: http://www.lsc-group.phys.uwm.edu/%7Eballen/driver/
Gabriele Gorla <gorlik@yahoo.com>, Gabriele Gorla <gorlik@yahoo.com>,
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Description Description
----------- -----------

2
Documentation/hwmon/w83627ehf
View File

@ -36,7 +36,7 @@ Supported chips:
Datasheet: Available from Nuvoton upon request Datasheet: Available from Nuvoton upon request
Authors: Authors:
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Yuan Mu (Winbond) Yuan Mu (Winbond)
Rudolf Marek <r.marek@assembler.cz> Rudolf Marek <r.marek@assembler.cz>
David Hubbard <david.c.hubbard@gmail.com> David Hubbard <david.c.hubbard@gmail.com>

2
Documentation/hwmon/w83795
View File

@ -13,7 +13,7 @@ Supported chips:
Authors: Authors:
Wei Song (Nuvoton) Wei Song (Nuvoton)
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Pin mapping Pin mapping

2
Documentation/hwmon/w83l785ts
View File

@ -9,7 +9,7 @@ Supported chips:
http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83L785TS-S.pdf http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83L785TS-S.pdf
Authors: Authors:
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Description Description
----------- -----------

2
Documentation/i2c/busses/i2c-i801
View File

@ -33,7 +33,7 @@ and the additional 'Integrated Device Function' controllers are supported.
Authors: Authors:
Mark Studebaker <mdsxyz123@yahoo.com> Mark Studebaker <mdsxyz123@yahoo.com>
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Module Parameters Module Parameters

2
Documentation/i2c/busses/i2c-parport
View File

@ -1,6 +1,6 @@
Kernel driver i2c-parport Kernel driver i2c-parport
Author: Jean Delvare <khali@linux-fr.org> Author: Jean Delvare <jdelvare@suse.de>
This is a unified driver for several i2c-over-parallel-port adapters, 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 such as the ones made by Philips, Velleman or ELV. This driver is

2
Documentation/i2c/busses/i2c-parport-light
View File

@ -1,6 +1,6 @@
Kernel driver i2c-parport-light Kernel driver i2c-parport-light
Author: Jean Delvare <khali@linux-fr.org> Author: Jean Delvare <jdelvare@suse.de>
This driver is a light version of i2c-parport. It doesn't depend 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 on the parport driver, and uses direct I/O access instead. This might be

2
Documentation/i2c/busses/i2c-taos-evm
View File

@ -1,6 +1,6 @@
Kernel driver i2c-taos-evm Kernel driver i2c-taos-evm
Author: Jean Delvare <khali@linux-fr.org> Author: Jean Delvare <jdelvare@suse.de>
This is a driver for the evaluation modules for TAOS I2C/SMBus chips. This is a driver for the evaluation modules for TAOS I2C/SMBus chips.
The modules include an SMBus master with limited capabilities, which can The modules include an SMBus master with limited capabilities, which can

2
Documentation/i2c/busses/i2c-viapro
View File

@ -28,7 +28,7 @@ Supported adapters:
Authors: Authors:
Kyösti Mälkki <kmalkki@cc.hut.fi>, Kyösti Mälkki <kmalkki@cc.hut.fi>,
Mark D. Studebaker <mdsxyz123@yahoo.com>, Mark D. Studebaker <mdsxyz123@yahoo.com>,
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Module Parameters Module Parameters
----------------- -----------------

2
Documentation/misc-devices/eeprom
View File

@ -38,7 +38,7 @@ Supported chips:
Authors: Authors:
Frodo Looijaard <frodol@dds.nl>, Frodo Looijaard <frodol@dds.nl>,
Philip Edelbrock <phil@netroedge.com>, Philip Edelbrock <phil@netroedge.com>,
Jean Delvare <khali@linux-fr.org>, Jean Delvare <jdelvare@suse.de>,
Greg Kroah-Hartman <greg@kroah.com>, Greg Kroah-Hartman <greg@kroah.com>,
IBM Corp. IBM Corp.

32
MAINTAINERS
View File

@ -347,7 +347,7 @@ M: Jiri Kosina <jkosina@suse.cz>
S: Maintained S: Maintained
ADM1025 HARDWARE MONITOR DRIVER ADM1025 HARDWARE MONITOR DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: Documentation/hwmon/adm1025 F: Documentation/hwmon/adm1025
@ -412,7 +412,7 @@ S: Maintained
F: drivers/macintosh/therm_adt746x.c F: drivers/macintosh/therm_adt746x.c
ADT7475 HARDWARE MONITOR DRIVER ADT7475 HARDWARE MONITOR DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: Documentation/hwmon/adt7475 F: Documentation/hwmon/adt7475
@ -3387,7 +3387,7 @@ F: drivers/video/exynos/exynos_mipi*
F: include/video/exynos_mipi* F: include/video/exynos_mipi*
F71805F HARDWARE MONITORING DRIVER F71805F HARDWARE MONITORING DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: Documentation/hwmon/f71805f F: Documentation/hwmon/f71805f
@ -3914,7 +3914,7 @@ S: Odd Fixes
F: drivers/tty/hvc/ F: drivers/tty/hvc/
HARDWARE MONITORING HARDWARE MONITORING
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
M: Guenter Roeck <linux@roeck-us.net> M: Guenter Roeck <linux@roeck-us.net>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
W: http://www.lm-sensors.org/ W: http://www.lm-sensors.org/
@ -4142,7 +4142,7 @@ F: include/linux/hyperv.h
F: tools/hv/ F: tools/hv/
I2C OVER PARALLEL PORT I2C OVER PARALLEL PORT
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/i2c/busses/i2c-parport F: Documentation/i2c/busses/i2c-parport
@ -4151,7 +4151,7 @@ F: drivers/i2c/busses/i2c-parport.c
F: drivers/i2c/busses/i2c-parport-light.c F: drivers/i2c/busses/i2c-parport-light.c
I2C/SMBUS CONTROLLER DRIVERS FOR PC I2C/SMBUS CONTROLLER DRIVERS FOR PC
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/i2c/busses/i2c-ali1535 F: Documentation/i2c/busses/i2c-ali1535
@ -4192,7 +4192,7 @@ F: drivers/i2c/busses/i2c-ismt.c
F: Documentation/i2c/busses/i2c-ismt F: Documentation/i2c/busses/i2c-ismt
I2C/SMBUS STUB DRIVER I2C/SMBUS STUB DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org
S: Maintained S: Maintained
F: drivers/i2c/i2c-stub.c F: drivers/i2c/i2c-stub.c
@ -4211,7 +4211,7 @@ F: include/uapi/linux/i2c.h
F: include/uapi/linux/i2c-*.h F: include/uapi/linux/i2c-*.h
I2C-TAOS-EVM DRIVER I2C-TAOS-EVM DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: linux-i2c@vger.kernel.org L: linux-i2c@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/i2c/busses/i2c-taos-evm F: Documentation/i2c/busses/i2c-taos-evm
@ -4768,7 +4768,7 @@ S: Maintained
F: drivers/isdn/hardware/eicon/ F: drivers/isdn/hardware/eicon/
IT87 HARDWARE MONITORING DRIVER IT87 HARDWARE MONITORING DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: Documentation/hwmon/it87 F: Documentation/hwmon/it87
@ -5138,7 +5138,7 @@ F: drivers/leds/
F: include/linux/leds.h F: include/linux/leds.h
LEGACY EEPROM DRIVER LEGACY EEPROM DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
S: Maintained S: Maintained
F: Documentation/misc-devices/eeprom F: Documentation/misc-devices/eeprom
F: drivers/misc/eeprom/eeprom.c F: drivers/misc/eeprom/eeprom.c
@ -5286,21 +5286,21 @@ S: Maintained
F: drivers/hwmon/lm73.c F: drivers/hwmon/lm73.c
LM78 HARDWARE MONITOR DRIVER LM78 HARDWARE MONITOR DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: Documentation/hwmon/lm78 F: Documentation/hwmon/lm78
F: drivers/hwmon/lm78.c F: drivers/hwmon/lm78.c
LM83 HARDWARE MONITOR DRIVER LM83 HARDWARE MONITOR DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: Documentation/hwmon/lm83 F: Documentation/hwmon/lm83
F: drivers/hwmon/lm83.c F: drivers/hwmon/lm83.c
LM90 HARDWARE MONITOR DRIVER LM90 HARDWARE MONITOR DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: Documentation/hwmon/lm90 F: Documentation/hwmon/lm90
@ -6493,7 +6493,7 @@ S: Maintained
F: drivers/char/pc8736x_gpio.c F: drivers/char/pc8736x_gpio.c
PC87427 HARDWARE MONITORING DRIVER PC87427 HARDWARE MONITORING DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: Documentation/hwmon/pc87427 F: Documentation/hwmon/pc87427
@ -7943,7 +7943,7 @@ F: Documentation/hwmon/sch5627
F: drivers/hwmon/sch5627.c F: drivers/hwmon/sch5627.c
SMSC47B397 HARDWARE MONITOR DRIVER SMSC47B397 HARDWARE MONITOR DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: Documentation/hwmon/smsc47b397 F: Documentation/hwmon/smsc47b397
@ -9461,7 +9461,7 @@ F: Documentation/hwmon/w83793
F: drivers/hwmon/w83793.c F: drivers/hwmon/w83793.c
W83795 HARDWARE MONITORING DRIVER W83795 HARDWARE MONITORING DRIVER
M: Jean Delvare <khali@linux-fr.org> M: Jean Delvare <jdelvare@suse.de>
L: lm-sensors@lm-sensors.org L: lm-sensors@lm-sensors.org
S: Maintained S: Maintained
F: drivers/hwmon/w83795.c F: drivers/hwmon/w83795.c

2
drivers/char/i8k.c
View File

@ -4,7 +4,7 @@
* Copyright (C) 2001 Massimo Dal Zotto <dz@debian.org> * Copyright (C) 2001 Massimo Dal Zotto <dz@debian.org>
* *
* Hwmon integration: * Hwmon integration:
* Copyright (C) 2011 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2011 Jean Delvare <jdelvare@suse.de>
* Copyright (C) 2013 Guenter Roeck <linux@roeck-us.net> * Copyright (C) 2013 Guenter Roeck <linux@roeck-us.net>
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it

4
drivers/hwmon/Kconfig
View File

@ -573,8 +573,8 @@ config SENSORS_IT87
help help
If you say yes here you get support for ITE IT8705F, IT8712F, If you say yes here you get support for ITE IT8705F, IT8712F,
IT8716F, IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E, IT8716F, IT8718F, IT8720F, IT8721F, IT8726F, IT8728F, IT8758E,
IT8771E, IT8772E, IT8782F, and IT8783E/F sensor chips, and the IT8771E, IT8772E, IT8782F, IT8783E/F and IT8603E sensor chips,
SiS950 clone. and the SiS950 clone.
This driver can also be built as a module. If so, the module This driver can also be built as a module. If so, the module
will be called it87. will be called it87.

4
drivers/hwmon/adm1025.c
View File

@ -2,7 +2,7 @@
* adm1025.c * adm1025.c
* *
* Copyright (C) 2000 Chen-Yuan Wu <gwu@esoft.com> * Copyright (C) 2000 Chen-Yuan Wu <gwu@esoft.com>
* Copyright (C) 2003-2009 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2003-2009 Jean Delvare <jdelvare@suse.de>
* *
* The ADM1025 is a sensor chip made by Analog Devices. It reports up to 6 * The ADM1025 is a sensor chip made by Analog Devices. It reports up to 6
* voltages (including its own power source) and up to two temperatures * voltages (including its own power source) and up to two temperatures
@ -615,6 +615,6 @@ static struct adm1025_data *adm1025_update_device(struct device *dev)
module_i2c_driver(adm1025_driver); module_i2c_driver(adm1025_driver);
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("ADM1025 driver"); MODULE_DESCRIPTION("ADM1025 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/hwmon/adm1029.c
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2006 Corentin LABBE <corentin.labbe@geomatys.fr> * Copyright (C) 2006 Corentin LABBE <corentin.labbe@geomatys.fr>
* *
* Based on LM83 Driver by Jean Delvare <khali@linux-fr.org> * Based on LM83 Driver by Jean Delvare <jdelvare@suse.de>
* *
* Give only processor, motherboard temperatures and fan tachs * Give only processor, motherboard temperatures and fan tachs
* Very rare chip please let me know if you use it * Very rare chip please let me know if you use it

2
drivers/hwmon/adm1031.c
View File

@ -4,7 +4,7 @@
* Based on lm75.c and lm85.c * Based on lm75.c and lm85.c
* Supports adm1030 / adm1031 * Supports adm1030 / adm1031
* Copyright (C) 2004 Alexandre d'Alton <alex@alexdalton.org> * Copyright (C) 2004 Alexandre d'Alton <alex@alexdalton.org>
* Reworked by Jean Delvare <khali@linux-fr.org> * Reworked by Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
drivers/hwmon/adt7475.c
View File

@ -3,7 +3,7 @@
* Copyright (C) 2007-2008, Advanced Micro Devices, Inc. * Copyright (C) 2007-2008, Advanced Micro Devices, Inc.
* Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net> * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
* Copyright (C) 2008 Hans de Goede <hdegoede@redhat.com> * Copyright (C) 2008 Hans de Goede <hdegoede@redhat.com>
* Copyright (C) 2009 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2009 Jean Delvare <jdelvare@suse.de>
* *
* Derived from the lm83 driver by Jean Delvare * Derived from the lm83 driver by Jean Delvare
* *

2
drivers/hwmon/ds1621.c
View File

@ -4,7 +4,7 @@
* Christian W. Zuckschwerdt <zany@triq.net> 2000-11-23 * Christian W. Zuckschwerdt <zany@triq.net> 2000-11-23
* based on lm75.c by Frodo Looijaard <frodol@dds.nl> * based on lm75.c by Frodo Looijaard <frodol@dds.nl>
* Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with * Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with
* the help of Jean Delvare <khali@linux-fr.org> * the help of Jean Delvare <jdelvare@suse.de>
* *
* The DS1621 device is a digital temperature/thermometer with 9-bit * The DS1621 device is a digital temperature/thermometer with 9-bit
* resolution, a thermal alarm output (Tout), and user-defined minimum * resolution, a thermal alarm output (Tout), and user-defined minimum

4
drivers/hwmon/emc6w201.c
View File

@ -1,6 +1,6 @@
/* /*
* emc6w201.c - Hardware monitoring driver for the SMSC EMC6W201 * emc6w201.c - Hardware monitoring driver for the SMSC EMC6W201
* Copyright (C) 2011 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2011 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -548,6 +548,6 @@ static struct i2c_driver emc6w201_driver = {
module_i2c_driver(emc6w201_driver); module_i2c_driver(emc6w201_driver);
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("SMSC EMC6W201 hardware monitoring driver"); MODULE_DESCRIPTION("SMSC EMC6W201 hardware monitoring driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/hwmon/f71805f.c
View File

@ -1,7 +1,7 @@
/* /*
* f71805f.c - driver for the Fintek F71805F/FG and F71872F/FG Super-I/O * f71805f.c - driver for the Fintek F71805F/FG and F71872F/FG Super-I/O
* chips integrated hardware monitoring features * chips integrated hardware monitoring features
* Copyright (C) 2005-2006 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2005-2006 Jean Delvare <jdelvare@suse.de>
* *
* The F71805F/FG is a LPC Super-I/O chip made by Fintek. It integrates * The F71805F/FG is a LPC Super-I/O chip made by Fintek. It integrates
* complete hardware monitoring features: voltage, fan and temperature * complete hardware monitoring features: voltage, fan and temperature

2
drivers/hwmon/gl518sm.c
View File

@ -4,7 +4,7 @@
* Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and * Copyright (C) 1998, 1999 Frodo Looijaard <frodol@dds.nl> and
* Kyosti Malkki <kmalkki@cc.hut.fi> * Kyosti Malkki <kmalkki@cc.hut.fi>
* Copyright (C) 2004 Hong-Gunn Chew <hglinux@gunnet.org> and * Copyright (C) 2004 Hong-Gunn Chew <hglinux@gunnet.org> and
* Jean Delvare <khali@linux-fr.org> * Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

108
drivers/hwmon/it87.c
View File

@ -10,7 +10,8 @@
* This driver supports only the Environment Controller in the IT8705F and * This driver supports only the Environment Controller in the IT8705F and
* similar parts. The other devices are supported by different drivers. * similar parts. The other devices are supported by different drivers.
* *
* Supports: IT8705F Super I/O chip w/LPC interface * Supports: IT8603E Super I/O chip w/LPC interface
* IT8705F Super I/O chip w/LPC interface
* IT8712F Super I/O chip w/LPC interface * IT8712F Super I/O chip w/LPC interface
* IT8716F Super I/O chip w/LPC interface * IT8716F Super I/O chip w/LPC interface
* IT8718F Super I/O chip w/LPC interface * IT8718F Super I/O chip w/LPC interface
@ -26,7 +27,7 @@
* Sis950 A clone of the IT8705F * Sis950 A clone of the IT8705F
* *
* Copyright (C) 2001 Chris Gauthron * Copyright (C) 2001 Chris Gauthron
* Copyright (C) 2005-2010 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2005-2010 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -64,7 +65,7 @@
#define DRVNAME "it87" #define DRVNAME "it87"
enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728, it8771, enum chips { it87, it8712, it8716, it8718, it8720, it8721, it8728, it8771,
it8772, it8782, it8783 }; it8772, it8782, it8783, it8603 };
static unsigned short force_id; static unsigned short force_id;
module_param(force_id, ushort, 0); module_param(force_id, ushort, 0);
@ -146,6 +147,7 @@ static inline void superio_exit(void)
#define IT8772E_DEVID 0x8772 #define IT8772E_DEVID 0x8772
#define IT8782F_DEVID 0x8782 #define IT8782F_DEVID 0x8782
#define IT8783E_DEVID 0x8783 #define IT8783E_DEVID 0x8783
#define IT8306E_DEVID 0x8603
#define IT87_ACT_REG 0x30 #define IT87_ACT_REG 0x30
#define IT87_BASE_REG 0x60 #define IT87_BASE_REG 0x60
@ -315,6 +317,12 @@ static const struct it87_devices it87_devices[] = {
| FEAT_TEMP_OLD_PECI, | FEAT_TEMP_OLD_PECI,
.old_peci_mask = 0x4, .old_peci_mask = 0x4,
}, },
[it8603] = {
.name = "it8603",
.features = FEAT_NEWER_AUTOPWM | FEAT_12MV_ADC | FEAT_16BIT_FANS
| FEAT_TEMP_OFFSET | FEAT_TEMP_PECI,
.peci_mask = 0x07,
},
}; };
#define has_16bit_fans(data) ((data)->features & FEAT_16BIT_FANS) #define has_16bit_fans(data) ((data)->features & FEAT_16BIT_FANS)
@ -361,7 +369,7 @@ struct it87_data {
unsigned long last_updated; /* In jiffies */ unsigned long last_updated; /* In jiffies */
u16 in_scaled; /* Internal voltage sensors are scaled */ u16 in_scaled; /* Internal voltage sensors are scaled */
u8 in[9][3]; /* [nr][0]=in, [1]=min, [2]=max */ u8 in[10][3]; /* [nr][0]=in, [1]=min, [2]=max */
u8 has_fan; /* Bitfield, fans enabled */ u8 has_fan; /* Bitfield, fans enabled */
u16 fan[5][2]; /* Register values, [nr][0]=fan, [1]=min */ u16 fan[5][2]; /* Register values, [nr][0]=fan, [1]=min */
u8 has_temp; /* Bitfield, temp sensors enabled */ u8 has_temp; /* Bitfield, temp sensors enabled */
@ -578,6 +586,7 @@ static SENSOR_DEVICE_ATTR_2(in7_max, S_IRUGO | S_IWUSR, show_in, set_in,
7, 2); 7, 2);
static SENSOR_DEVICE_ATTR_2(in8_input, S_IRUGO, show_in, NULL, 8, 0); static SENSOR_DEVICE_ATTR_2(in8_input, S_IRUGO, show_in, NULL, 8, 0);
static SENSOR_DEVICE_ATTR_2(in9_input, S_IRUGO, show_in, NULL, 9, 0);
/* 3 temperatures */ /* 3 temperatures */
static ssize_t show_temp(struct device *dev, struct device_attribute *attr, static ssize_t show_temp(struct device *dev, struct device_attribute *attr,
@ -734,7 +743,7 @@ static int pwm_mode(const struct it87_data *data, int nr)
{ {
int ctrl = data->fan_main_ctrl & (1 << nr); int ctrl = data->fan_main_ctrl & (1 << nr);
if (ctrl == 0) /* Full speed */ if (ctrl == 0 && data->type != it8603) /* Full speed */
return 0; return 0;
if (data->pwm_ctrl[nr] & 0x80) /* Automatic mode */ if (data->pwm_ctrl[nr] & 0x80) /* Automatic mode */
return 2; return 2;
@ -929,6 +938,10 @@ static ssize_t set_pwm_enable(struct device *dev,
return -EINVAL; return -EINVAL;
} }
/* IT8603E does not have on/off mode */
if (val == 0 && data->type == it8603)
return -EINVAL;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
if (val == 0) { if (val == 0) {
@ -948,10 +961,13 @@ static ssize_t set_pwm_enable(struct device *dev,
else /* Automatic mode */ else /* Automatic mode */
data->pwm_ctrl[nr] = 0x80 | data->pwm_temp_map[nr]; data->pwm_ctrl[nr] = 0x80 | data->pwm_temp_map[nr];
it87_write_value(data, IT87_REG_PWM(nr), data->pwm_ctrl[nr]); it87_write_value(data, IT87_REG_PWM(nr), data->pwm_ctrl[nr]);
/* set SmartGuardian mode */
data->fan_main_ctrl |= (1 << nr); if (data->type != it8603) {
it87_write_value(data, IT87_REG_FAN_MAIN_CTRL, /* set SmartGuardian mode */
data->fan_main_ctrl); data->fan_main_ctrl |= (1 << nr);
it87_write_value(data, IT87_REG_FAN_MAIN_CTRL,
data->fan_main_ctrl);
}
} }
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
@ -1415,6 +1431,8 @@ static ssize_t show_label(struct device *dev, struct device_attribute *attr,
static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 0); static SENSOR_DEVICE_ATTR(in3_label, S_IRUGO, show_label, NULL, 0);
static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 1); static SENSOR_DEVICE_ATTR(in7_label, S_IRUGO, show_label, NULL, 1);
static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 2); static SENSOR_DEVICE_ATTR(in8_label, S_IRUGO, show_label, NULL, 2);
/* special AVCC3 IT8306E in9 */
static SENSOR_DEVICE_ATTR(in9_label, S_IRUGO, show_label, NULL, 0);
static ssize_t show_name(struct device *dev, struct device_attribute static ssize_t show_name(struct device *dev, struct device_attribute
*devattr, char *buf) *devattr, char *buf)
@ -1424,7 +1442,7 @@ static ssize_t show_name(struct device *dev, struct device_attribute
} }
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL); static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
static struct attribute *it87_attributes_in[9][5] = { static struct attribute *it87_attributes_in[10][5] = {
{ {
&sensor_dev_attr_in0_input.dev_attr.attr, &sensor_dev_attr_in0_input.dev_attr.attr,
&sensor_dev_attr_in0_min.dev_attr.attr, &sensor_dev_attr_in0_min.dev_attr.attr,
@ -1476,9 +1494,12 @@ static struct attribute *it87_attributes_in[9][5] = {
}, { }, {
&sensor_dev_attr_in8_input.dev_attr.attr, &sensor_dev_attr_in8_input.dev_attr.attr,
NULL NULL
}, {
&sensor_dev_attr_in9_input.dev_attr.attr,
NULL
} }; } };
static const struct attribute_group it87_group_in[9] = { static const struct attribute_group it87_group_in[10] = {
{ .attrs = it87_attributes_in[0] }, { .attrs = it87_attributes_in[0] },
{ .attrs = it87_attributes_in[1] }, { .attrs = it87_attributes_in[1] },
{ .attrs = it87_attributes_in[2] }, { .attrs = it87_attributes_in[2] },
@ -1488,6 +1509,7 @@ static const struct attribute_group it87_group_in[9] = {
{ .attrs = it87_attributes_in[6] }, { .attrs = it87_attributes_in[6] },
{ .attrs = it87_attributes_in[7] }, { .attrs = it87_attributes_in[7] },
{ .attrs = it87_attributes_in[8] }, { .attrs = it87_attributes_in[8] },
{ .attrs = it87_attributes_in[9] },
}; };
static struct attribute *it87_attributes_temp[3][6] = { static struct attribute *it87_attributes_temp[3][6] = {
@ -1546,7 +1568,8 @@ static struct attribute *it87_attributes_in_beep[] = {
&sensor_dev_attr_in5_beep.dev_attr.attr, &sensor_dev_attr_in5_beep.dev_attr.attr,
&sensor_dev_attr_in6_beep.dev_attr.attr, &sensor_dev_attr_in6_beep.dev_attr.attr,
&sensor_dev_attr_in7_beep.dev_attr.attr, &sensor_dev_attr_in7_beep.dev_attr.attr,
NULL NULL,
NULL,
}; };
static struct attribute *it87_attributes_temp_beep[] = { static struct attribute *it87_attributes_temp_beep[] = {
@ -1685,6 +1708,7 @@ static struct attribute *it87_attributes_label[] = {
&sensor_dev_attr_in3_label.dev_attr.attr, &sensor_dev_attr_in3_label.dev_attr.attr,
&sensor_dev_attr_in7_label.dev_attr.attr, &sensor_dev_attr_in7_label.dev_attr.attr,
&sensor_dev_attr_in8_label.dev_attr.attr, &sensor_dev_attr_in8_label.dev_attr.attr,
&sensor_dev_attr_in9_label.dev_attr.attr,
NULL NULL
}; };
@ -1742,6 +1766,9 @@ static int __init it87_find(unsigned short *address,
case IT8783E_DEVID: case IT8783E_DEVID:
sio_data->type = it8783; sio_data->type = it8783;
break; break;
case IT8306E_DEVID:
sio_data->type = it8603;
break;
case 0xffff: /* No device at all */ case 0xffff: /* No device at all */
goto exit; goto exit;
default: default:
@ -1763,11 +1790,16 @@ static int __init it87_find(unsigned short *address,
err = 0; err = 0;
sio_data->revision = superio_inb(DEVREV) & 0x0f; sio_data->revision = superio_inb(DEVREV) & 0x0f;
pr_info("Found IT%04xF chip at 0x%x, revision %d\n", pr_info("Found IT%04x%c chip at 0x%x, revision %d\n", chip_type,
chip_type, *address, sio_data->revision); chip_type == 0x8771 || chip_type == 0x8772 ||
chip_type == 0x8603 ? 'E' : 'F', *address,
sio_data->revision);
/* in8 (Vbat) is always internal */ /* in8 (Vbat) is always internal */
sio_data->internal = (1 << 2); sio_data->internal = (1 << 2);
/* Only the IT8603E has in9 */
if (sio_data->type != it8603)
sio_data->skip_in |= (1 << 9);
/* Read GPIO config and VID value from LDN 7 (GPIO) */ /* Read GPIO config and VID value from LDN 7 (GPIO) */
if (sio_data->type == it87) { if (sio_data->type == it87) {
@ -1844,7 +1876,38 @@ static int __init it87_find(unsigned short *address,
sio_data->internal |= (1 << 1); sio_data->internal |= (1 << 1);
sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f; sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
} else if (sio_data->type == it8603) {
int reg27, reg29;
sio_data->skip_vid = 1; /* No VID */
superio_select(GPIO);
reg27 = superio_inb(IT87_SIO_GPIO3_REG);
/* Check if fan3 is there or not */
if (reg27 & (1 << 6))
sio_data->skip_pwm |= (1 << 2);
if (reg27 & (1 << 7))
sio_data->skip_fan |= (1 << 2);
/* Check if fan2 is there or not */
reg29 = superio_inb(IT87_SIO_GPIO5_REG);
if (reg29 & (1 << 1))
sio_data->skip_pwm |= (1 << 1);
if (reg29 & (1 << 2))
sio_data->skip_fan |= (1 << 1);
sio_data->skip_in |= (1 << 5); /* No VIN5 */
sio_data->skip_in |= (1 << 6); /* No VIN6 */
/* no fan4 */
sio_data->skip_pwm |= (1 << 3);
sio_data->skip_fan |= (1 << 3);
sio_data->internal |= (1 << 1); /* in7 is VSB */
sio_data->internal |= (1 << 3); /* in9 is AVCC */
sio_data->beep_pin = superio_inb(IT87_SIO_BEEP_PIN_REG) & 0x3f;
} else { } else {
int reg; int reg;
bool uart6; bool uart6;
@ -1966,7 +2029,7 @@ static void it87_remove_files(struct device *dev)
int i; int i;
sysfs_remove_group(&dev->kobj, &it87_group); sysfs_remove_group(&dev->kobj, &it87_group);
for (i = 0; i < 9; i++) { for (i = 0; i < 10; i++) {
if (sio_data->skip_in & (1 << i)) if (sio_data->skip_in & (1 << i))
continue; continue;
sysfs_remove_group(&dev->kobj, &it87_group_in[i]); sysfs_remove_group(&dev->kobj, &it87_group_in[i]);
@ -2080,6 +2143,8 @@ static int it87_probe(struct platform_device *pdev)
data->in_scaled |= (1 << 7); /* in7 is VSB */ data->in_scaled |= (1 << 7); /* in7 is VSB */
if (sio_data->internal & (1 << 2)) if (sio_data->internal & (1 << 2))
data->in_scaled |= (1 << 8); /* in8 is Vbat */ data->in_scaled |= (1 << 8); /* in8 is Vbat */
if (sio_data->internal & (1 << 3))
data->in_scaled |= (1 << 9); /* in9 is AVCC */
} else if (sio_data->type == it8782 || sio_data->type == it8783) { } else if (sio_data->type == it8782 || sio_data->type == it8783) {
if (sio_data->internal & (1 << 0)) if (sio_data->internal & (1 << 0))
data->in_scaled |= (1 << 3); /* in3 is VCC5V */ data->in_scaled |= (1 << 3); /* in3 is VCC5V */
@ -2102,7 +2167,7 @@ static int it87_probe(struct platform_device *pdev)
if (err) if (err)
return err; return err;
for (i = 0; i < 9; i++) { for (i = 0; i < 10; i++) {
if (sio_data->skip_in & (1 << i)) if (sio_data->skip_in & (1 << i))
continue; continue;
err = sysfs_create_group(&dev->kobj, &it87_group_in[i]); err = sysfs_create_group(&dev->kobj, &it87_group_in[i]);
@ -2202,7 +2267,7 @@ static int it87_probe(struct platform_device *pdev)
} }
/* Export labels for internal sensors */ /* Export labels for internal sensors */
for (i = 0; i < 3; i++) { for (i = 0; i < 4; i++) {
if (!(sio_data->internal & (1 << i))) if (!(sio_data->internal & (1 << i)))
continue; continue;
err = sysfs_create_file(&dev->kobj, err = sysfs_create_file(&dev->kobj,
@ -2383,8 +2448,9 @@ static void it87_init_device(struct platform_device *pdev)
} }
data->has_fan = (data->fan_main_ctrl >> 4) & 0x07; data->has_fan = (data->fan_main_ctrl >> 4) & 0x07;
/* Set tachometers to 16-bit mode if needed */ /* Set tachometers to 16-bit mode if needed, IT8603E (and IT8728F?)
if (has_16bit_fans(data)) { * has it by default */
if (has_16bit_fans(data) && data->type != it8603) {
tmp = it87_read_value(data, IT87_REG_FAN_16BIT); tmp = it87_read_value(data, IT87_REG_FAN_16BIT);
if (~tmp & 0x07 & data->has_fan) { if (~tmp & 0x07 & data->has_fan) {
dev_dbg(&pdev->dev, dev_dbg(&pdev->dev,
@ -2464,6 +2530,8 @@ static struct it87_data *it87_update_device(struct device *dev)
} }
/* in8 (battery) has no limit registers */ /* in8 (battery) has no limit registers */
data->in[8][0] = it87_read_value(data, IT87_REG_VIN(8)); data->in[8][0] = it87_read_value(data, IT87_REG_VIN(8));
if (data->type == it8603)
data->in[9][0] = it87_read_value(data, 0x2f);
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
/* Skip disabled fans */ /* Skip disabled fans */
@ -2620,7 +2688,7 @@ static void __exit sm_it87_exit(void)
} }
MODULE_AUTHOR("Chris Gauthron, Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Chris Gauthron, Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("IT8705F/IT871xF/IT872xF hardware monitoring driver"); MODULE_DESCRIPTION("IT8705F/IT871xF/IT872xF hardware monitoring driver");
module_param(update_vbat, bool, 0); module_param(update_vbat, bool, 0);
MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value"); MODULE_PARM_DESC(update_vbat, "Update vbat if set else return powerup value");

4
drivers/hwmon/lm63.c
View File

@ -1,7 +1,7 @@
/* /*
* lm63.c - driver for the National Semiconductor LM63 temperature sensor * lm63.c - driver for the National Semiconductor LM63 temperature sensor
* with integrated fan control * with integrated fan control
* Copyright (C) 2004-2008 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2004-2008 Jean Delvare <jdelvare@suse.de>
* Based on the lm90 driver. * Based on the lm90 driver.
* *
* The LM63 is a sensor chip made by National Semiconductor. It measures * The LM63 is a sensor chip made by National Semiconductor. It measures
@ -1202,6 +1202,6 @@ static struct i2c_driver lm63_driver = {
module_i2c_driver(lm63_driver); module_i2c_driver(lm63_driver);
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("LM63 driver"); MODULE_DESCRIPTION("LM63 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/hwmon/lm78.c
View File

@ -2,7 +2,7 @@
* lm78.c - Part of lm_sensors, Linux kernel modules for hardware * lm78.c - Part of lm_sensors, Linux kernel modules for hardware
* monitoring * monitoring
* Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl> * Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>
* Copyright (c) 2007, 2011 Jean Delvare <khali@linux-fr.org> * Copyright (c) 2007, 2011 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -1108,7 +1108,7 @@ static void __exit sm_lm78_exit(void)
i2c_del_driver(&lm78_driver); i2c_del_driver(&lm78_driver);
} }
MODULE_AUTHOR("Frodo Looijaard, Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Frodo Looijaard, Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("LM78/LM79 driver"); MODULE_DESCRIPTION("LM78/LM79 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/hwmon/lm83.c
View File

@ -1,7 +1,7 @@
/* /*
* lm83.c - Part of lm_sensors, Linux kernel modules for hardware * lm83.c - Part of lm_sensors, Linux kernel modules for hardware
* monitoring * monitoring
* Copyright (C) 2003-2009 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2003-2009 Jean Delvare <jdelvare@suse.de>
* *
* Heavily inspired from the lm78, lm75 and adm1021 drivers. The LM83 is * Heavily inspired from the lm78, lm75 and adm1021 drivers. The LM83 is
* a sensor chip made by National Semiconductor. It reports up to four * a sensor chip made by National Semiconductor. It reports up to four
@ -427,6 +427,6 @@ static struct lm83_data *lm83_update_device(struct device *dev)
module_i2c_driver(lm83_driver); module_i2c_driver(lm83_driver);
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("LM83 driver"); MODULE_DESCRIPTION("LM83 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/hwmon/lm85.c
View File

@ -5,7 +5,7 @@
* Copyright (c) 2002, 2003 Philip Pokorny <ppokorny@penguincomputing.com> * Copyright (c) 2002, 2003 Philip Pokorny <ppokorny@penguincomputing.com>
* Copyright (c) 2003 Margit Schubert-While <margitsw@t-online.de> * Copyright (c) 2003 Margit Schubert-While <margitsw@t-online.de>
* Copyright (c) 2004 Justin Thiessen <jthiessen@penguincomputing.com> * Copyright (c) 2004 Justin Thiessen <jthiessen@penguincomputing.com>
* Copyright (C) 2007--2009 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2007--2009 Jean Delvare <jdelvare@suse.de>
* *
* Chip details at <http://www.national.com/ds/LM/LM85.pdf> * Chip details at <http://www.national.com/ds/LM/LM85.pdf>
* *

4
drivers/hwmon/lm87.c
View File

@ -5,7 +5,7 @@
* Philip Edelbrock <phil@netroedge.com> * Philip Edelbrock <phil@netroedge.com>
* Stephen Rousset <stephen.rousset@rocketlogix.com> * Stephen Rousset <stephen.rousset@rocketlogix.com>
* Dan Eaton <dan.eaton@rocketlogix.com> * Dan Eaton <dan.eaton@rocketlogix.com>
* Copyright (C) 2004-2008 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2004-2008 Jean Delvare <jdelvare@suse.de>
* *
* Original port to Linux 2.6 by Jeff Oliver. * Original port to Linux 2.6 by Jeff Oliver.
* *
@ -1011,6 +1011,6 @@ static struct i2c_driver lm87_driver = {
module_i2c_driver(lm87_driver); module_i2c_driver(lm87_driver);
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org> and others"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de> and others");
MODULE_DESCRIPTION("LM87 driver"); MODULE_DESCRIPTION("LM87 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/hwmon/lm90.c
View File

@ -1,7 +1,7 @@
/* /*
* lm90.c - Part of lm_sensors, Linux kernel modules for hardware * lm90.c - Part of lm_sensors, Linux kernel modules for hardware
* monitoring * monitoring
* Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2003-2010 Jean Delvare <jdelvare@suse.de>
* *
* Based on the lm83 driver. The LM90 is a sensor chip made by National * Based on the lm83 driver. The LM90 is a sensor chip made by National
* Semiconductor. It reports up to two temperatures (its own plus up to * Semiconductor. It reports up to two temperatures (its own plus up to
@ -1679,6 +1679,6 @@ static struct i2c_driver lm90_driver = {
module_i2c_driver(lm90_driver); module_i2c_driver(lm90_driver);
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("LM90/ADM1032 driver"); MODULE_DESCRIPTION("LM90/ADM1032 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/hwmon/lm92.c
View File

@ -1,6 +1,6 @@
/* /*
* lm92 - Hardware monitoring driver * lm92 - Hardware monitoring driver
* Copyright (C) 2005-2008 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2005-2008 Jean Delvare <jdelvare@suse.de>
* *
* Based on the lm90 driver, with some ideas taken from the lm_sensors * Based on the lm90 driver, with some ideas taken from the lm_sensors
* lm92 driver as well. * lm92 driver as well.
@ -440,6 +440,6 @@ static struct i2c_driver lm92_driver = {
module_i2c_driver(lm92_driver); module_i2c_driver(lm92_driver);
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("LM92/MAX6635 driver"); MODULE_DESCRIPTION("LM92/MAX6635 driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/hwmon/lm93.c
View File

@ -12,7 +12,7 @@
* Copyright (c) 2003 Margit Schubert-While <margitsw@t-online.de> * Copyright (c) 2003 Margit Schubert-While <margitsw@t-online.de>
* *
* derived in part from w83l785ts.c: * derived in part from w83l785ts.c:
* Copyright (c) 2003-2004 Jean Delvare <khali@linux-fr.org> * Copyright (c) 2003-2004 Jean Delvare <jdelvare@suse.de>
* *
* Ported to Linux 2.6 by Eric J. Bowersox <ericb@aspsys.com> * Ported to Linux 2.6 by Eric J. Bowersox <ericb@aspsys.com>
* Copyright (c) 2005 Aspen Systems, Inc. * Copyright (c) 2005 Aspen Systems, Inc.

5
drivers/hwmon/max1619.c
View File

@ -2,7 +2,7 @@
* max1619.c - Part of lm_sensors, Linux kernel modules for hardware * max1619.c - Part of lm_sensors, Linux kernel modules for hardware
* monitoring * monitoring
* Copyright (C) 2003-2004 Oleksij Rempel <bug-track@fisher-privat.net> * Copyright (C) 2003-2004 Oleksij Rempel <bug-track@fisher-privat.net>
* Jean Delvare <khali@linux-fr.org> * Jean Delvare <jdelvare@suse.de>
* *
* Based on the lm90 driver. The MAX1619 is a sensor chip made by Maxim. * Based on the lm90 driver. The MAX1619 is a sensor chip made by Maxim.
* It reports up to two temperatures (its own plus up to * It reports up to two temperatures (its own plus up to
@ -357,7 +357,6 @@ static struct max1619_data *max1619_update_device(struct device *dev)
module_i2c_driver(max1619_driver); module_i2c_driver(max1619_driver);
MODULE_AUTHOR("Oleksij Rempel <bug-track@fisher-privat.net> and " MODULE_AUTHOR("Oleksij Rempel <bug-track@fisher-privat.net>, Jean Delvare <jdelvare@suse.de>");
"Jean Delvare <khali@linux-fr.org>");
MODULE_DESCRIPTION("MAX1619 sensor driver"); MODULE_DESCRIPTION("MAX1619 sensor driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/hwmon/max6642.c
View File

@ -8,7 +8,7 @@
* *
* Based on the max1619 driver. * Based on the max1619 driver.
* Copyright (C) 2003-2004 Oleksij Rempel <bug-track@fisher-privat.net> * Copyright (C) 2003-2004 Oleksij Rempel <bug-track@fisher-privat.net>
* Jean Delvare <khali@linux-fr.org> * Jean Delvare <jdelvare@suse.de>
* *
* The MAX6642 is a sensor chip made by Maxim. * The MAX6642 is a sensor chip made by Maxim.
* It reports up to two temperatures (its own plus up to * It reports up to two temperatures (its own plus up to

2
drivers/hwmon/nct6775.c
View File

@ -5,7 +5,7 @@
* Copyright (C) 2012 Guenter Roeck <linux@roeck-us.net> * Copyright (C) 2012 Guenter Roeck <linux@roeck-us.net>
* *
* Derived from w83627ehf driver * Derived from w83627ehf driver
* Copyright (C) 2005-2012 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2005-2012 Jean Delvare <jdelvare@suse.de>
* Copyright (C) 2006 Yuan Mu (Winbond), * Copyright (C) 2006 Yuan Mu (Winbond),
* Rudolf Marek <r.marek@assembler.cz> * Rudolf Marek <r.marek@assembler.cz>
* David Hubbard <david.c.hubbard@gmail.com> * David Hubbard <david.c.hubbard@gmail.com>

4
drivers/hwmon/pc87360.c
View File

@ -1,7 +1,7 @@
/* /*
* pc87360.c - Part of lm_sensors, Linux kernel modules * pc87360.c - Part of lm_sensors, Linux kernel modules
* for hardware monitoring * for hardware monitoring
* Copyright (C) 2004, 2007 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2004, 2007 Jean Delvare <jdelvare@suse.de>
* *
* Copied from smsc47m1.c: * Copied from smsc47m1.c:
* Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> * Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
@ -1808,7 +1808,7 @@ static void __exit pc87360_exit(void)
} }
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("PC8736x hardware monitor"); MODULE_DESCRIPTION("PC8736x hardware monitor");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/hwmon/pc87427.c
View File

@ -1,7 +1,7 @@
/* /*
* pc87427.c - hardware monitoring driver for the * pc87427.c - hardware monitoring driver for the
* National Semiconductor PC87427 Super-I/O chip * National Semiconductor PC87427 Super-I/O chip
* Copyright (C) 2006, 2008, 2010 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2006, 2008, 2010 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
@ -1347,7 +1347,7 @@ static void __exit pc87427_exit(void)
platform_driver_unregister(&pc87427_driver); platform_driver_unregister(&pc87427_driver);
} }
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("PC87427 hardware monitoring driver"); MODULE_DESCRIPTION("PC87427 hardware monitoring driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/hwmon/pcf8591.c
View File

@ -1,7 +1,7 @@
/* /*
* Copyright (C) 2001-2004 Aurelien Jarno <aurelien@aurel32.net> * Copyright (C) 2001-2004 Aurelien Jarno <aurelien@aurel32.net>
* Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with * Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with
* the help of Jean Delvare <khali@linux-fr.org> * the help of Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
drivers/hwmon/sis5595.c
View File

@ -6,7 +6,7 @@
* Kyösti Mälkki <kmalkki@cc.hut.fi>, and * Kyösti Mälkki <kmalkki@cc.hut.fi>, and
* Mark D. Studebaker <mdsxyz123@yahoo.com> * Mark D. Studebaker <mdsxyz123@yahoo.com>
* Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with * Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with
* the help of Jean Delvare <khali@linux-fr.org> * the help of Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
drivers/hwmon/smsc47b397.c
View File

@ -9,7 +9,7 @@
* *
* derived in part from smsc47m1.c: * derived in part from smsc47m1.c:
* Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> * Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
* Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2004 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
drivers/hwmon/smsc47m1.c
View File

@ -7,7 +7,7 @@
* Super-I/O chips. * Super-I/O chips.
* *
* Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> * Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
* Copyright (C) 2004-2007 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2004-2007 Jean Delvare <jdelvare@suse.de>
* Ported to Linux 2.6 by Gabriele Gorla <gorlik@yahoo.com> * Ported to Linux 2.6 by Gabriele Gorla <gorlik@yahoo.com>
* and Jean Delvare * and Jean Delvare
* *

4
drivers/hwmon/w83627ehf.c
View File

@ -1,7 +1,7 @@
/* /*
* w83627ehf - Driver for the hardware monitoring functionality of * w83627ehf - Driver for the hardware monitoring functionality of
* the Winbond W83627EHF Super-I/O chip * the Winbond W83627EHF Super-I/O chip
* Copyright (C) 2005-2012 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2005-2012 Jean Delvare <jdelvare@suse.de>
* Copyright (C) 2006 Yuan Mu (Winbond), * Copyright (C) 2006 Yuan Mu (Winbond),
* Rudolf Marek <r.marek@assembler.cz> * Rudolf Marek <r.marek@assembler.cz>
* David Hubbard <david.c.hubbard@gmail.com> * David Hubbard <david.c.hubbard@gmail.com>
@ -2889,7 +2889,7 @@ static void __exit sensors_w83627ehf_exit(void)
platform_driver_unregister(&w83627ehf_driver); platform_driver_unregister(&w83627ehf_driver);
} }
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("W83627EHF driver"); MODULE_DESCRIPTION("W83627EHF driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/hwmon/w83627hf.c
View File

@ -5,7 +5,7 @@
* Philip Edelbrock <phil@netroedge.com>, * Philip Edelbrock <phil@netroedge.com>,
* and Mark Studebaker <mdsxyz123@yahoo.com> * and Mark Studebaker <mdsxyz123@yahoo.com>
* Ported to 2.6 by Bernhard C. Schrenk <clemy@clemy.org> * Ported to 2.6 by Bernhard C. Schrenk <clemy@clemy.org>
* Copyright (c) 2007 - 1012 Jean Delvare <khali@linux-fr.org> * Copyright (c) 2007 - 1012 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
drivers/hwmon/w83781d.c
View File

@ -4,7 +4,7 @@
* Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>, * Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>,
* Philip Edelbrock <phil@netroedge.com>, * Philip Edelbrock <phil@netroedge.com>,
* and Mark Studebaker <mdsxyz123@yahoo.com> * and Mark Studebaker <mdsxyz123@yahoo.com>
* Copyright (c) 2007 - 2008 Jean Delvare <khali@linux-fr.org> * Copyright (c) 2007 - 2008 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

4
drivers/hwmon/w83795.c
View File

@ -2,7 +2,7 @@
* w83795.c - Linux kernel driver for hardware monitoring * w83795.c - Linux kernel driver for hardware monitoring
* Copyright (C) 2008 Nuvoton Technology Corp. * Copyright (C) 2008 Nuvoton Technology Corp.
* Wei Song * Wei Song
* Copyright (C) 2010 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2010 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -2282,6 +2282,6 @@ static struct i2c_driver w83795_driver = {
module_i2c_driver(w83795_driver); module_i2c_driver(w83795_driver);
MODULE_AUTHOR("Wei Song, Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Wei Song, Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("W83795G/ADG hardware monitoring driver"); MODULE_DESCRIPTION("W83795G/ADG hardware monitoring driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

6
drivers/hwmon/w83l785ts.c
View File

@ -1,7 +1,7 @@
/* /*
* w83l785ts.c - Part of lm_sensors, Linux kernel modules for hardware * w83l785ts.c - Part of lm_sensors, Linux kernel modules for hardware
* monitoring * monitoring
* Copyright (C) 2003-2009 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2003-2009 Jean Delvare <jdelvare@suse.de>
* *
* Inspired from the lm83 driver. The W83L785TS-S is a sensor chip made * Inspired from the lm83 driver. The W83L785TS-S is a sensor chip made
* by Winbond. It reports a single external temperature with a 1 deg * by Winbond. It reports a single external temperature with a 1 deg
@ -10,7 +10,7 @@
* http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83L785TS-S.pdf * http://www.winbond-usa.com/products/winbond_products/pdfs/PCIC/W83L785TS-S.pdf
* *
* Ported to Linux 2.6 by Wolfgang Ziegler <nuppla@gmx.at> and Jean Delvare * Ported to Linux 2.6 by Wolfgang Ziegler <nuppla@gmx.at> and Jean Delvare
* <khali@linux-fr.org>. * <jdelvare@suse.de>.
* *
* Thanks to James Bolt <james@evilpenguin.com> for benchmarking the read * Thanks to James Bolt <james@evilpenguin.com> for benchmarking the read
* error handling mechanism. * error handling mechanism.
@ -299,6 +299,6 @@ static struct w83l785ts_data *w83l785ts_update_device(struct device *dev)
module_i2c_driver(w83l785ts_driver); module_i2c_driver(w83l785ts_driver);
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("W83L785TS-S driver"); MODULE_DESCRIPTION("W83L785TS-S driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/i2c/algos/i2c-algo-bit.c
View File

@ -20,7 +20,7 @@
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki /* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki
<kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */ <kmalkki@cc.hut.fi> and Jean Delvare <jdelvare@suse.de> */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/module.h> #include <linux/module.h>

4
drivers/i2c/busses/i2c-amd756-s4882.c
View File

@ -1,7 +1,7 @@
/* /*
* i2c-amd756-s4882.c - i2c-amd756 extras for the Tyan S4882 motherboard * i2c-amd756-s4882.c - i2c-amd756 extras for the Tyan S4882 motherboard
* *
* Copyright (C) 2004, 2008 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2004, 2008 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -250,7 +250,7 @@ static void __exit amd756_s4882_exit(void)
"Physical bus restoration failed\n"); "Physical bus restoration failed\n");
} }
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("S4882 SMBus multiplexing"); MODULE_DESCRIPTION("S4882 SMBus multiplexing");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

5
drivers/i2c/busses/i2c-i801.c
View File

@ -2,7 +2,7 @@
Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>,
Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker
<mdsxyz123@yahoo.com> <mdsxyz123@yahoo.com>
Copyright (C) 2007 - 2012 Jean Delvare <khali@linux-fr.org> Copyright (C) 2007 - 2012 Jean Delvare <jdelvare@suse.de>
Copyright (C) 2010 Intel Corporation, Copyright (C) 2010 Intel Corporation,
David Woodhouse <dwmw2@infradead.org> David Woodhouse <dwmw2@infradead.org>
@ -1312,8 +1312,7 @@ static void __exit i2c_i801_exit(void)
pci_unregister_driver(&i801_driver); pci_unregister_driver(&i801_driver);
} }
MODULE_AUTHOR("Mark D. Studebaker <mdsxyz123@yahoo.com>, " MODULE_AUTHOR("Mark D. Studebaker <mdsxyz123@yahoo.com>, Jean Delvare <jdelvare@suse.de>");
"Jean Delvare <khali@linux-fr.org>");
MODULE_DESCRIPTION("I801 SMBus driver"); MODULE_DESCRIPTION("I801 SMBus driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/i2c/busses/i2c-nforce2-s4985.c
View File

@ -1,7 +1,7 @@
/* /*
* i2c-nforce2-s4985.c - i2c-nforce2 extras for the Tyan S4985 motherboard * i2c-nforce2-s4985.c - i2c-nforce2 extras for the Tyan S4985 motherboard
* *
* Copyright (C) 2008 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2008 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -245,7 +245,7 @@ static void __exit nforce2_s4985_exit(void)
"Physical bus restoration failed\n"); "Physical bus restoration failed\n");
} }
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("S4985 SMBus multiplexing"); MODULE_DESCRIPTION("S4985 SMBus multiplexing");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/i2c/busses/i2c-parport-light.c
View File

@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------ * /* ------------------------------------------------------------------------ *
* i2c-parport-light.c I2C bus over parallel port * * i2c-parport-light.c I2C bus over parallel port *
* ------------------------------------------------------------------------ * * ------------------------------------------------------------------------ *
Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org> Copyright (C) 2003-2010 Jean Delvare <jdelvare@suse.de>
Based on older i2c-velleman.c driver Based on older i2c-velleman.c driver
Copyright (C) 1995-2000 Simon G. Vogl Copyright (C) 1995-2000 Simon G. Vogl
@ -273,7 +273,7 @@ static void __exit i2c_parport_exit(void)
release_region(base, 3); release_region(base, 3);
} }
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("I2C bus over parallel port (light)"); MODULE_DESCRIPTION("I2C bus over parallel port (light)");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/i2c/busses/i2c-parport.c
View File

@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------ * /* ------------------------------------------------------------------------ *
* i2c-parport.c I2C bus over parallel port * * i2c-parport.c I2C bus over parallel port *
* ------------------------------------------------------------------------ * * ------------------------------------------------------------------------ *
Copyright (C) 2003-2011 Jean Delvare <khali@linux-fr.org> Copyright (C) 2003-2011 Jean Delvare <jdelvare@suse.de>
Based on older i2c-philips-par.c driver Based on older i2c-philips-par.c driver
Copyright (C) 1995-2000 Simon G. Vogl Copyright (C) 1995-2000 Simon G. Vogl
@ -298,7 +298,7 @@ static void __exit i2c_parport_exit(void)
parport_unregister_driver(&i2c_parport_driver); parport_unregister_driver(&i2c_parport_driver);
} }
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("I2C bus over parallel port"); MODULE_DESCRIPTION("I2C bus over parallel port");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/i2c/busses/i2c-parport.h
View File

@ -1,7 +1,7 @@
/* ------------------------------------------------------------------------ * /* ------------------------------------------------------------------------ *
* i2c-parport.h I2C bus over parallel port * * i2c-parport.h I2C bus over parallel port *
* ------------------------------------------------------------------------ * * ------------------------------------------------------------------------ *
Copyright (C) 2003-2010 Jean Delvare <khali@linux-fr.org> Copyright (C) 2003-2010 Jean Delvare <jdelvare@suse.de>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

4
drivers/i2c/busses/i2c-taos-evm.c
View File

@ -3,7 +3,7 @@
* These devices include an I2C master which can be controlled over the * These devices include an I2C master which can be controlled over the
* serial port. * serial port.
* *
* Copyright (C) 2007 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2007 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -321,7 +321,7 @@ static void __exit taos_exit(void)
serio_unregister_driver(&taos_drv); serio_unregister_driver(&taos_drv);
} }
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("TAOS evaluation module driver"); MODULE_DESCRIPTION("TAOS evaluation module driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

4
drivers/i2c/busses/i2c-viapro.c
View File

@ -2,7 +2,7 @@
Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>,
Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>, Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>,
Mark D. Studebaker <mdsxyz123@yahoo.com> Mark D. Studebaker <mdsxyz123@yahoo.com>
Copyright (C) 2005 - 2008 Jean Delvare <khali@linux-fr.org> Copyright (C) 2005 - 2008 Jean Delvare <jdelvare@suse.de>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -503,7 +503,7 @@ static void __exit i2c_vt596_exit(void)
MODULE_AUTHOR("Kyosti Malkki <kmalkki@cc.hut.fi>, " MODULE_AUTHOR("Kyosti Malkki <kmalkki@cc.hut.fi>, "
"Mark D. Studebaker <mdsxyz123@yahoo.com> and " "Mark D. Studebaker <mdsxyz123@yahoo.com> and "
"Jean Delvare <khali@linux-fr.org>"); "Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("vt82c596 SMBus driver"); MODULE_DESCRIPTION("vt82c596 SMBus driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/i2c/i2c-core.c
View File

@ -21,7 +21,7 @@
/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>. /* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl> All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and
Jean Delvare <khali@linux-fr.org> Jean Delvare <jdelvare@suse.de>
Mux support by Rodolfo Giometti <giometti@enneenne.com> and Mux support by Rodolfo Giometti <giometti@enneenne.com> and
Michael Lawnick <michael.lawnick.ext@nsn.com> Michael Lawnick <michael.lawnick.ext@nsn.com>
OF support is copyright (c) 2008 Jochen Friedrich <jochen@scram.de> OF support is copyright (c) 2008 Jochen Friedrich <jochen@scram.de>

4
drivers/i2c/i2c-smbus.c
View File

@ -2,7 +2,7 @@
* i2c-smbus.c - SMBus extensions to the I2C protocol * i2c-smbus.c - SMBus extensions to the I2C protocol
* *
* Copyright (C) 2008 David Brownell * Copyright (C) 2008 David Brownell
* Copyright (C) 2010 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2010 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -246,6 +246,6 @@ EXPORT_SYMBOL_GPL(i2c_handle_smbus_alert);
module_i2c_driver(smbalert_driver); module_i2c_driver(smbalert_driver);
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>");
MODULE_DESCRIPTION("SMBus protocol extensions support"); MODULE_DESCRIPTION("SMBus protocol extensions support");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");

2
drivers/i2c/i2c-stub.c
View File

@ -2,7 +2,7 @@
i2c-stub.c - I2C/SMBus chip emulator i2c-stub.c - I2C/SMBus chip emulator
Copyright (c) 2004 Mark M. Hoffman <mhoffman@lightlink.com> Copyright (c) 2004 Mark M. Hoffman <mhoffman@lightlink.com>
Copyright (C) 2007, 2012 Jean Delvare <khali@linux-fr.org> Copyright (C) 2007, 2012 Jean Delvare <jdelvare@suse.de>
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by

2
drivers/i2c/muxes/i2c-mux-pca954x.c
View File

@ -28,7 +28,7 @@
* Based on: * Based on:
* i2c-virtual_cb.c from Brian Kuschak <bkuschak@yahoo.com> * i2c-virtual_cb.c from Brian Kuschak <bkuschak@yahoo.com>
* and * and
* pca9540.c from Jean Delvare <khali@linux-fr.org>. * pca9540.c from Jean Delvare <jdelvare@suse.de>.
* *
* This file is licensed under the terms of the GNU General Public * This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any * License version 2. This program is licensed "as is" without any

2
drivers/misc/eeprom/eeprom.c
View File

@ -3,7 +3,7 @@
* Philip Edelbrock <phil@netroedge.com> * Philip Edelbrock <phil@netroedge.com>
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com> * Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2003 IBM Corp. * Copyright (C) 2003 IBM Corp.
* Copyright (C) 2004 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2004 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

2
include/linux/i2c-smbus.h
View File

@ -1,7 +1,7 @@
/* /*
* i2c-smbus.h - SMBus extensions to the I2C protocol * i2c-smbus.h - SMBus extensions to the I2C protocol
* *
* Copyright (C) 2010 Jean Delvare <khali@linux-fr.org> * Copyright (C) 2010 Jean Delvare <jdelvare@suse.de>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by