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

Commit 464c9098 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/groeck/staging 

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (24 commits)
  hwmon: (lm90) Refactor reading of config2 register
  hwmon: (lm90) Make SA56004 detection more robust
  hwmon: (lm90) Simplify handling of extended local temp register
  hwmon: (pmbus) Add client driver for LM25066, LM5064, and LM5066
  hwmon: (max34440) Add support for peak attributes
  hwmon: (max8688) Add support for peak attributes
  hwmon: (max16064) Add support for peak attributes
  hwmon: (adm1275) Add support for peak attributes
  hwmon: (pmbus) Add support for peak attributes
  hwmon: Add new attributes to sysfs ABI
  hwmon: (pmbus) Strengthen check for status register existence
  hwmon: (pmbus) Add support for virtual pages
  hwmon: (pmbus) Support reading and writing of word registers in device specific code
  hwmon: (pmbus) Increase attribute name size
  hwmon: (pmbus) Add ADP4000, NCP4200 and NCP4208 to list of supported devices
  hwmon: (pmbus) Add support for VID output voltage mode
  hwmon: (pmbus) Move PMBus drivers to drivers/hwmon/pmbus
  hwmon: (coretemp) Add core/pkg threshold support to Coretemp
  hwmon: (lm95241) Add support for LM95231
  hwmon: LM95245 driver
  ...
parents 4c677e2e f90be42f

Documentation/hwmon/adm1275

+6 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ Documentation/hwmon/pmbus for details. 
Sysfs entries

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



The following attributes are supported. Limits are read-write; all other

attributes are read-only.

The following attributes are supported. Limits are read-write, history reset

attributes are write-only, all other attributes are read-only.



in1_label		"vin1" or "vout1" depending on chip variant and

			configuration.
@@ -53,8 +53,12 @@ in1_min Minumum Voltage. From VOUT_UV_WARN_LIMIT register. 
in1_max			Maximum voltage. From VOUT_OV_WARN_LIMIT register.

in1_min_alarm		Voltage low alarm. From VOLTAGE_UV_WARNING status.

in1_max_alarm		Voltage high alarm. From VOLTAGE_OV_WARNING status.

in1_highest		Historical maximum voltage.

in1_reset_history	Write any value to reset history.



curr1_label		"iout1"

curr1_input		Measured current. From READ_IOUT register.

curr1_max		Maximum current. From IOUT_OC_WARN_LIMIT register.

curr1_max_alarm		Current high alarm. From IOUT_OC_WARN_LIMIT register.

curr1_highest		Historical maximum current.

curr1_reset_history	Write any value to reset history.

Documentation/hwmon/coretemp

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,13 @@ the Out-Of-Spec bit. Following table summarizes the exported sysfs files: 
All Sysfs entries are named with their core_id (represented here by 'X').

tempX_input	 - Core temperature (in millidegrees Celsius).

tempX_max	 - All cooling devices should be turned on (on Core2).

		   Initialized with IA32_THERM_INTERRUPT. When the CPU

		   temperature reaches this temperature, an interrupt is

		   generated and tempX_max_alarm is set.

tempX_max_hyst   - If the CPU temperature falls below than temperature,

		   an interrupt is generated and tempX_max_alarm is reset.

tempX_max_alarm  - Set if the temperature reaches or exceeds tempX_max.

		   Reset if the temperature drops to or below tempX_max_hyst.

tempX_crit	 - Maximum junction temperature (in millidegrees Celsius).

tempX_crit_alarm - Set when Out-of-spec bit is set, never clears.

		   Correct CPU operation is no longer guaranteed.

Documentation/hwmon/lm25066

0 → 100644
+90 −0
Original line number Diff line number Diff line 
Kernel driver max8688

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



Supported chips:

  * National Semiconductor LM25066

    Prefix: 'lm25066'

    Addresses scanned: -

    Datasheets:

	http://www.national.com/pf/LM/LM25066.html

	http://www.national.com/pf/LM/LM25066A.html

  * National Semiconductor LM5064

    Prefix: 'lm5064'

    Addresses scanned: -

    Datasheet:

	http://www.national.com/pf/LM/LM5064.html

  * National Semiconductor LM5066

    Prefix: 'lm5066'

    Addresses scanned: -

    Datasheet:

	http://www.national.com/pf/LM/LM5066.html



Author: Guenter Roeck <guenter.roeck@ericsson.com>





Description

-----------



This driver supports hardware montoring for National Semiconductor LM25066,

LM5064, and LM5064 Power Management, Monitoring, Control, and Protection ICs.



The driver is a client driver to the core PMBus driver. Please see

Documentation/hwmon/pmbus for details on PMBus client drivers.





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.





Platform data support

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



The driver supports standard PMBus driver platform data.





Sysfs entries

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



The following attributes are supported. Limits are read-write; all other

attributes are read-only.



in1_label		"vin"

in1_input		Measured input voltage.

in1_average		Average measured input voltage.

in1_min			Minimum input voltage.

in1_max			Maximum input voltage.

in1_min_alarm		Input voltage low alarm.

in1_max_alarm		Input voltage high alarm.



in2_label		"vout1"

in2_input		Measured output voltage.

in2_average		Average measured output voltage.

in2_min			Minimum output voltage.

in2_min_alarm		Output voltage low alarm.



in3_label		"vout2"

in3_input		Measured voltage on vaux pin



curr1_label		"iin"

curr1_input		Measured input current.

curr1_average		Average measured input current.

curr1_max		Maximum input current.

curr1_max_alarm		Input current high alarm.



power1_label		"pin"

power1_input		Measured input power.

power1_average		Average measured input power.

power1_max		Maximum input power limit.

power1_alarm		Input power alarm

power1_input_highest	Historical maximum power.

power1_reset_history	Write any value to reset maximum power history.



temp1_input		Measured temperature.

temp1_max		Maximum temperature.

temp1_crit		Critical high temperature.

temp1_max_alarm		Chip temperature high alarm.

temp1_crit_alarm	Chip temperature critical high alarm.

Documentation/hwmon/lm90

+8 −1
Original line number Diff line number Diff line
@@ -113,7 +113,11 @@ Supported chips: 
    Prefix: 'w83l771'

    Addresses scanned: I2C 0x4c

    Datasheet: Not publicly available, can be requested from Nuvoton



  * Philips/NXP SA56004X

    Prefix: 'sa56004'

    Addresses scanned: I2C 0x48 through 0x4F

    Datasheet: Publicly available at NXP website

               http://ics.nxp.com/products/interface/datasheet/sa56004x.pdf



Author: Jean Delvare <khali@linux-fr.org>
@@ -193,6 +197,9 @@ W83L771AWG/ASG 
  * The AWG and ASG variants only differ in package format.

  * Diode ideality factor configuration (remote sensor) at 0xE3



SA56004X:

  * Better local resolution



All temperature values are given in degrees Celsius. Resolution

is 1.0 degree for the local temperature, 0.125 degree for the remote

temperature, except for the MAX6657, MAX6658 and MAX6659 which have a

Documentation/hwmon/lm95245

0 → 100644
+33 −0
Original line number Diff line number Diff line 
Kernel driver lm95245

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



Supported chips:

  * National Semiconductor LM95245

    Addresses scanned: I2C 0x18, 0x19, 0x29, 0x4c, 0x4d

    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/mpf/LM/LM95245.html





Author: Alexander Stein <alexander.stein@systec-electronic.com>



Description

-----------



The LM95245 is an 11-bit digital temperature sensor with a 2-wire System

Management Bus (SMBus) interface and TruTherm technology that can monitor

the temperature of a remote diode as well as its own temperature.

The LM95245 can be used to very accurately monitor the temperature of

external devices such as microprocessors.



All temperature values are given in millidegrees Celsius. Local temperature

is given within a range of -127 to +127.875 degrees. Remote temperatures are

given within a range of -127 to +255 degrees. Resolution depends on

temperature input and range.



Each sensor has its own critical limit, but the hysteresis is common to all

two channels.



The lm95245 driver can change its update interval to a fixed set of values.

It will round up to the next selectable interval. See the datasheet for exact

values. Reading sensor values more often will do no harm, but will return

'old' values.