Commit d7511ec8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6 

* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6: (59 commits)
  hwmon: (lm80) Add individual alarm files
  hwmon: (lm80) De-macro the sysfs callbacks
  hwmon: (lm80) Various cleanups
  hwmon: (w83627hf) Refactor beep enable handling
  hwmon: (w83627hf) Add individual alarm and beep files
  hwmon: (w83627hf) Enable VBAT monitoring
  hwmon: (w83627ehf) The W83627DHG has 8 VID pins
  hwmon: (asb100) Add individual alarm files
  hwmon: (asb100) De-macro the sysfs callbacks
  hwmon: (asb100) Various cleanups
  hwmon: VRM is not written to registers
  hwmon: (dme1737) fix Super-IO device ID override
  hwmon: (dme1737) fix divide-by-0
  hwmon: (abituguru3) Add AUX4 fan input for Abit IP35 Pro
  hwmon: Add support for Texas Instruments/Burr-Brown ADS7828
  hwmon: (adm9240) Add individual alarm files
  hwmon: (lm77) Add individual alarm files
  hwmon: Discard useless I2C driver IDs
  hwmon: (lm85) Make the pwmN_enable files writable
  hwmon: (lm85) Return standard values in pwmN_enable
  ...
parents 0b61a2ba e84542f5

Documentation/hwmon/ads7828

0 → 100644
+36 −0
Original line number Diff line number Diff line 
Kernel driver ads7828

=====================



Supported chips:

  * Texas Instruments/Burr-Brown ADS7828

    Prefix: 'ads7828'

    Addresses scanned: I2C 0x48, 0x49, 0x4a, 0x4b

    Datasheet: Publicly available at the Texas Instruments website :

               http://focus.ti.com/lit/ds/symlink/ads7828.pdf



Authors:

        Steve Hardy <steve@linuxrealtime.co.uk>



Module Parameters

-----------------



* se_input: bool (default Y)

  Single ended operation - set to N for differential mode

* int_vref: bool (default Y)

  Operate with the internal 2.5V reference - set to N for external reference

* vref_mv: int (default 2500)

  If using an external reference, set this to the reference voltage in mV



Description

-----------



This driver implements support for the Texas Instruments ADS7828.



This device is a 12-bit 8-channel A-D converter.



It can operate in single ended mode (8 +ve inputs) or in differential mode,

where 4 differential pairs can be measured.



The chip also has the facility to use an external voltage reference.  This

may be required if your hardware supplies the ADS7828 from a 5V supply, see

the datasheet for more details.

Documentation/hwmon/it87

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ Supported chips: 
    Datasheet: No longer be available



Authors:

    Christophe Gauthron <chrisg@0-in.com>

    Christophe Gauthron

    Jean Delvare <khali@linux-fr.org>

Documentation/hwmon/lm78

+2 −2
Original line number Diff line number Diff line
@@ -4,12 +4,12 @@ Kernel driver lm78 
Supported chips:

  * National Semiconductor LM78 / LM78-J

    Prefix: 'lm78'

    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)

    Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)

    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/

  * National Semiconductor LM79

    Prefix: 'lm79'

    Addresses scanned: I2C 0x20 - 0x2f, ISA 0x290 (8 I/O ports)

    Addresses scanned: I2C 0x28 - 0x2f, ISA 0x290 (8 I/O ports)

    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/

Documentation/hwmon/lm87

+8 −3
Original line number Diff line number Diff line
@@ -4,8 +4,12 @@ Kernel driver lm87 
Supported chips:

  * National Semiconductor LM87

    Prefix: 'lm87'

    Addresses scanned: I2C 0x2c - 0x2f

    Addresses scanned: I2C 0x2c - 0x2e

    Datasheet: http://www.national.com/pf/LM/LM87.html

  * Analog Devices ADM1024

    Prefix: 'adm1024'

    Addresses scanned: I2C 0x2c - 0x2e

    Datasheet: http://www.analog.com/en/prod/0,2877,ADM1024,00.html



Authors:

        Frodo Looijaard <frodol@dds.nl>,
@@ -19,11 +23,12 @@ Authors: 
Description

-----------



This driver implements support for the National Semiconductor LM87.

This driver implements support for the National Semiconductor LM87

and the Analog Devices ADM1024.



The LM87 implements up to three temperature sensors, up to two fan

rotation speed sensors, up to seven voltage sensors, alarms, and some

miscellaneous stuff.

miscellaneous stuff. The ADM1024 is fully compatible.



Temperatures are measured in degrees Celsius. Each input has a high

and low alarm settings. A high limit produces an alarm when the value

Documentation/hwmon/userspace-tools

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ Lm-sensors 


Core set of utilities that will allow you to obtain health information,

setup monitoring limits etc. You can get them on their homepage

http://www.lm-sensors.nu/ or as a package from your Linux distribution.

http://www.lm-sensors.org/ or as a package from your Linux distribution.



If from website:

Get lm-sensors from project web site. Please note, you need only userspace

CRA Git | Maintained and supported by SUSTech CRA and CCSE