Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c63e38a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: New driver for the SMSC EMC6W201
  hwmon: (abituguru) Depend on DMI
  hwmon: (it87) Use request_muxed_region
  hwmon: (sch5627) Trigger Vbat measurements
  hwmon: (sch5627) Add sch5627_send_cmd function
  i8k: Integrate with the hwmon subsystem
  hwmon: (max6650) Properly support the MAX6650
  hwmon: (max6650) Drop device detection
  Move ACPI power meter driver to hwmon
  hwmon: (f71882fg) Add support for F71808A
  hwmon: (f71882fg) Split has_beep in fan_has_beep and temp_has_beep
  hwmon: (asc7621) Drop duplicate dependency
  hwmon: (jc42) Change detection class
  hwmon: Add driver for AMD family 15h processor power information
  hwmon: (k10temp) Add support for Fam15h (Bulldozer)
  hwmon: Use helper functions to set and get driver data
  i8k: Avoid lahf in 64-bit code
parents 0798b1db b0b349a8

Documentation/hwmon/emc6w201

0 → 100644
+42 −0
Original line number Diff line number Diff line 
Kernel driver emc6w201

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



Supported chips:

  * SMSC EMC6W201

    Prefix: 'emc6w201'

    Addresses scanned: I2C 0x2c, 0x2d, 0x2e

    Datasheet: Not public



Author: Jean Delvare <khali@linux-fr.org>





Description

-----------



From the datasheet:



"The EMC6W201 is an environmental monitoring device with automatic fan

control capability and enhanced system acoustics for noise suppression.

This ACPI compliant device provides hardware monitoring for up to six

voltages (including its own VCC) and five external thermal sensors,

measures the speed of up to five fans, and controls the speed of

multiple DC fans using three Pulse Width Modulator (PWM) outputs. Note

that it is possible to control more than three fans by connecting two

fans to one PWM output. The EMC6W201 will be available in a 36-pin

QFN package."



The device is functionally close to the EMC6D100 series, but is

register-incompatible.



The driver currently only supports the monitoring of the voltages,

temperatures and fan speeds. Limits can be changed. Alarms are not

supported, and neither is fan speed control.





Known Systems With EMC6W201

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



The EMC6W201 is a rare device, only found on a few systems, made in

2005 and 2006. Known systems with this device:

* Dell Precision 670 workstation

* Gigabyte 2CEWH mainboard

Documentation/hwmon/f71882fg

+4 −0
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ Supported chips: 
    Prefix: 'f71808e'

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

    Datasheet: Not public

  * Fintek F71808A

    Prefix: 'f71808a'

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

    Datasheet: Not public

  * Fintek F71858FG

    Prefix: 'f71858fg'

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

Documentation/hwmon/fam15h_power

0 → 100644
+37 −0
Original line number Diff line number Diff line 
Kernel driver fam15h_power

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



Supported chips:

* AMD Family 15h Processors



  Prefix: 'fam15h_power'

  Addresses scanned: PCI space

  Datasheets:

  BIOS and Kernel Developer's Guide (BKDG) For AMD Family 15h Processors

    (not yet published)



Author: Andreas Herrmann <andreas.herrmann3@amd.com>



Description

-----------



This driver permits reading of registers providing power information

of AMD Family 15h processors.



For AMD Family 15h processors the following power values can be

calculated using different processor northbridge function registers:



* BasePwrWatts: Specifies in watts the maximum amount of power

  consumed by the processor for NB and logic external to the core.

* ProcessorPwrWatts: Specifies in watts the maximum amount of power

  the processor can support.

* CurrPwrWatts: Specifies in watts the current amount of power being

  consumed by the processor.



This driver provides ProcessorPwrWatts and CurrPwrWatts:

* power1_crit (ProcessorPwrWatts)

* power1_input (CurrPwrWatts)



On multi-node processors the calculated value is for the entire

package and not for a single node. Thus the driver creates sysfs

attributes only for internal node0 of a multi-node processor.

Documentation/hwmon/k10temp

+2 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Supported chips: 
  Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)

* AMD Family 12h processors: "Llano"

* AMD Family 14h processors: "Brazos" (C/E/G-Series)

* AMD Family 15h processors: "Bulldozer"



  Prefix: 'k10temp'

  Addresses scanned: PCI space
@@ -40,7 +41,7 @@ Description 
-----------



This driver permits reading of the internal temperature sensor of AMD

Family 10h/11h/12h/14h processors.

Family 10h/11h/12h/14h/15h processors.



All these processors have a sensor, but on those for Socket F or AM2+,

the sensor may return inconsistent values (erratum 319).  The driver

Documentation/hwmon/max6650

+16 −5
Original line number Diff line number Diff line
@@ -2,9 +2,13 @@ Kernel driver max6650 
=====================



Supported chips:

  * Maxim 6650 / 6651

  * Maxim MAX6650

    Prefix: 'max6650'

    Addresses scanned: I2C 0x1b, 0x1f, 0x48, 0x4b

    Addresses scanned: none

    Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf

  * Maxim MAX6651

    Prefix: 'max6651'

    Addresses scanned: none

    Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6650-MAX6651.pdf



Authors:
@@ -15,10 +19,10 @@ Authors: 
Description

-----------



This driver implements support for the Maxim 6650/6651

This driver implements support for the Maxim MAX6650 and MAX6651.



The 2 devices are very similar, but the Maxim 6550 has a reduced feature

set, e.g. only one fan-input, instead of 4 for the 6651.

The 2 devices are very similar, but the MAX6550 has a reduced feature

set, e.g. only one fan-input, instead of 4 for the MAX6651.



The driver is not able to distinguish between the 2 devices.
@@ -36,6 +40,13 @@ fan1_div rw sets the speed range the inputs can handle. Legal 
			values are 1, 2, 4, and 8. Use lower values for

			faster fans.



Usage notes

-----------



This driver does not auto-detect devices. You will have to instantiate the

devices explicitly. Please see Documentation/i2c/instantiating-devices for

details.



Module parameters

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