Commit 64d9a39e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/hwmon-2.6:
  hwmon: Fix debug messages in w83781d
  hwmon: Let w83781d and lm78 load again
  w83627ehf: Fix the detection of fan5
  k8temp: Documentation update
  smsc47m1: List the SMSC LPC47M112 as supported
  hwmon: Fix documentation typos
  adm9240: Update Grant Coady's email address
  w83791d: Fix unchecked return status
parents 17e6c600 bd452e6f

Documentation/hwmon/adm9240

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ Authors: 
    Frodo Looijaard <frodol@dds.nl>,

    Frodo Looijaard <frodol@dds.nl>,

    Philip Edelbrock <phil@netroedge.com>,

    Philip Edelbrock <phil@netroedge.com>,

    Michiel Rook <michiel@grendelproject.nl>,

    Michiel Rook <michiel@grendelproject.nl>,

    Grant Coady <gcoady@gmail.com> with guidance

    Grant Coady <gcoady.lk@gmail.com> with guidance

        from Jean Delvare <khali@linux-fr.org>

        from Jean Delvare <khali@linux-fr.org>





Interface

Interface

Documentation/hwmon/f71805f

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ Thanks to Kris Chen from Fintek for answering technical questions and 
providing additional documentation.

providing additional documentation.





Thanks to Chris Lin from Jetway for providing wiring schematics and

Thanks to Chris Lin from Jetway for providing wiring schematics and

anwsering technical questions.

answering technical questions.









Description

Description

Documentation/hwmon/k8temp

+8 −5
Original line number Original line Diff line number Diff line
@@ -2,7 +2,7 @@ Kernel driver k8temp 
====================

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





Supported chips:

Supported chips:

  * AMD K8 CPU

  * AMD Athlon64/FX or Opteron CPUs

    Prefix: 'k8temp'

    Prefix: 'k8temp'

    Addresses scanned: PCI space

    Addresses scanned: PCI space

    Datasheet: http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf

    Datasheet: http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf
@@ -13,10 +13,13 @@ Contact: Rudolf Marek <r.marek@sh.cvut.cz> 
Description

Description

-----------

-----------





This driver permits reading temperature sensor(s) embedded inside AMD K8 CPUs.

This driver permits reading temperature sensor(s) embedded inside AMD K8

Official documentation says that it works from revision F of K8 core, but

family CPUs (Athlon64/FX, Opteron). Official documentation says that it works

in fact it seems to be implemented for all revisions of K8 except the first

from revision F of K8 core, but in fact it seems to be implemented for all

two revisions (SH-B0 and SH-B3).

revisions of K8 except the first two revisions (SH-B0 and SH-B3).



Please note that you will need at least lm-sensors 2.10.1 for proper userspace

support.





There can be up to four temperature sensors inside single CPU. The driver

There can be up to four temperature sensors inside single CPU. The driver

will auto-detect the sensors and will display only temperatures from

will auto-detect the sensors and will display only temperatures from

Documentation/hwmon/smsc47m1

+3 −1
Original line number Original line Diff line number Diff line
@@ -2,12 +2,14 @@ Kernel driver smsc47m1 
======================

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





Supported chips:

Supported chips:

  * SMSC LPC47B27x, LPC47M10x, LPC47M13x, LPC47M14x, LPC47M15x and LPC47M192

  * SMSC LPC47B27x, LPC47M112, LPC47M10x, LPC47M13x, LPC47M14x,

    LPC47M15x and LPC47M192

    Addresses scanned: none, address read from Super I/O config space

    Addresses scanned: none, address read from Super I/O config space

    Prefix: 'smsc47m1'

    Prefix: 'smsc47m1'

    Datasheets:

    Datasheets:

        http://www.smsc.com/main/datasheets/47b27x.pdf

        http://www.smsc.com/main/datasheets/47b27x.pdf

        http://www.smsc.com/main/datasheets/47m10x.pdf

        http://www.smsc.com/main/datasheets/47m10x.pdf

        http://www.smsc.com/main/datasheets/47m112.pdf

        http://www.smsc.com/main/tools/discontinued/47m13x.pdf

        http://www.smsc.com/main/tools/discontinued/47m13x.pdf

        http://www.smsc.com/main/datasheets/47m14x.pdf

        http://www.smsc.com/main/datasheets/47m14x.pdf

        http://www.smsc.com/main/tools/discontinued/47m15x.pdf

        http://www.smsc.com/main/tools/discontinued/47m15x.pdf

Documentation/hwmon/w83627ehf

+3 −3
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ fan control mode). 
Temperatures are measured in degrees Celsius and measurement resolution is 1

Temperatures are measured in degrees Celsius and measurement resolution is 1

degC for temp1 and 0.5 degC for temp2 and temp3. An alarm is triggered when

degC for temp1 and 0.5 degC for temp2 and temp3. An alarm is triggered when

the temperature gets higher than high limit; it stays on until the temperature

the temperature gets higher than high limit; it stays on until the temperature

falls below the Hysteresis value.

falls below the hysteresis value.





Fan rotation speeds are reported in RPM (rotations per minute). An alarm is

Fan rotation speeds are reported in RPM (rotations per minute). An alarm is

triggered if the rotation speed has dropped below a programmable limit. Fan

triggered if the rotation speed has dropped below a programmable limit. Fan
@@ -67,9 +67,9 @@ Thermal Cruise mode 




If the temperature is in the range defined by:

If the temperature is in the range defined by:





pwm[1-4]_target    - set target temperature, unit millidegree Celcius

pwm[1-4]_target    - set target temperature, unit millidegree Celsius

		     (range 0 - 127000)

		     (range 0 - 127000)

pwm[1-4]_tolerance - tolerance, unit millidegree Celcius (range 0 - 15000)

pwm[1-4]_tolerance - tolerance, unit millidegree Celsius (range 0 - 15000)





there are no changes to fan speed. Once the temperature leaves the interval,

there are no changes to fan speed. Once the temperature leaves the interval,

fan speed increases (temp is higher) or decreases if lower than desired.

fan speed increases (temp is higher) or decreases if lower than desired.