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

Commit 6fad2b5b 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:
  hwmon: (coretemp) Fix checkpatch errors
  hwmon: Remove pkgtemp driver
  hwmon: (coretemp) Merge pkgtemp with coretemp
  hwmon: (pmbus) Add support for Analog Devices ADM1275
  hwmon: (pmbus) Support for TI UCD90xxx series Sequencer and System Health Controllers
  hwmon: (pmbus) Add support for TI UCD9200 series of PWM System Controllers
  hwmon: (pmbus) Use device specific function to read fan configuration
  hwmon: (pmbus) Expand scope of device specific get_status function
  hwmon: (pmbus) Introduce infrastructure to detect sensors and limit registers
  hwmon: Driver for MAX16065 System Manager and compatibles
  hwmon: (sht15) add support for CRC validation
  hwmon: (sht15) add support for the status register
  hwmon: (sht15) clean-up the probe function
  hwmon: (sht15) general code clean-up
  hwmon: Add support for MAX6642
parents 19504828 4cc45275

Documentation/hwmon/adm1275

0 → 100644
+60 −0
Original line number Diff line number Diff line 
Kernel driver adm1275

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



Supported chips:

  * Analog Devices ADM1275

    Prefix: 'adm1275'

    Addresses scanned: -

    Datasheet: www.analog.com/static/imported-files/data_sheets/ADM1275.pdf



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





Description

-----------



This driver supports hardware montoring for Analog Devices ADM1275 Hot-Swap

Controller and Digital Power Monitor.



The ADM1275 is a hot-swap controller that allows a circuit board to be removed

from or inserted into a live backplane. It also features current and voltage

readback via an integrated 12-bit analog-to-digital converter (ADC), accessed

using a PMBus. interface.



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. Please see

Documentation/hwmon/pmbus for details.





Sysfs entries

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



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

attributes are read-only.



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

			configuration.

in1_input		Measured voltage. From READ_VOUT register.

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.



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.

Documentation/hwmon/coretemp

+14 −7
Original line number Diff line number Diff line
@@ -15,8 +15,13 @@ Author: Rudolf Marek 


Description

-----------

This driver permits reading the DTS (Digital Temperature Sensor) embedded

inside Intel CPUs. This driver can read both the per-core and per-package

temperature using the appropriate sensors. The per-package sensor is new;

as of now, it is present only in the SandyBridge platform. The driver will

show the temperature of all cores inside a package under a single device

directory inside hwmon.



This driver permits reading temperature sensor embedded inside Intel Core CPU.

Temperature is measured in degrees Celsius and measurement resolution is

1 degree C. Valid temperatures are from 0 to TjMax degrees C, because

the actual value of temperature register is in fact a delta from TjMax.
@@ -27,13 +32,15 @@ mechanism will perform actions to forcibly cool down the processor. Alarm 
may be raised, if the temperature grows enough (more than TjMax) to trigger

the Out-Of-Spec bit. Following table summarizes the exported sysfs files:



temp1_input	 - Core temperature (in millidegrees Celsius).

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

temp1_crit	 - Maximum junction temperature (in millidegrees Celsius).

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

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).

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.

temp1_label	 - Contains string "Core X", where X is processor

		   number.

tempX_label	 - Contains string "Core X", where X is processor

		   number. For Package temp, this will be "Physical id Y",

		   where Y is the package number.



The TjMax temperature is set to 85 degrees C if undocumented model specific

register (UMSR) 0xee has bit 30 set. If not the TjMax is 100 degrees C as

Documentation/hwmon/max16065

0 → 100644
+98 −0
Original line number Diff line number Diff line 
Kernel driver max16065

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



Supported chips:

  * Maxim MAX16065, MAX16066

    Prefixes: 'max16065', 'max16066'

    Addresses scanned: -

    Datasheet:

	http://datasheets.maxim-ic.com/en/ds/MAX16065-MAX16066.pdf

 *  Maxim MAX16067

    Prefix: 'max16067'

    Addresses scanned: -

    Datasheet:

	http://datasheets.maxim-ic.com/en/ds/MAX16067.pdf

 *  Maxim MAX16068

    Prefix: 'max16068'

    Addresses scanned: -

    Datasheet:

	http://datasheets.maxim-ic.com/en/ds/MAX16068.pdf

 *  Maxim MAX16070/MAX16071

    Prefixes: 'max16070', 'max16071'

    Addresses scanned: -

    Datasheet:

	http://datasheets.maxim-ic.com/en/ds/MAX16070-MAX16071.pdf





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





Description

-----------



[From datasheets] The MAX16065/MAX16066 flash-configurable system managers

monitor and sequence multiple system voltages. The MAX16065/MAX16066 can also

accurately monitor (+/-2.5%) one current channel using a dedicated high-side

current-sense amplifier. The MAX16065 manages up to twelve system voltages

simultaneously, and the MAX16066 manages up to eight supply voltages.



The MAX16067 flash-configurable system manager monitors and sequences multiple

system voltages. The MAX16067 manages up to six system voltages simultaneously.



The MAX16068 flash-configurable system manager monitors and manages up to six

system voltages simultaneously.



The MAX16070/MAX16071 flash-configurable system monitors supervise multiple

system voltages. The MAX16070/MAX16071 can also accurately monitor (+/-2.5%)

one current channel using a dedicated high-side current-sense amplifier. The

MAX16070 monitors up to twelve system voltages simultaneously, and the MAX16071

monitors up to eight supply voltages.



Each monitored channel has its own low and high critical limits. MAX16065,

MAX16066, MAX16070, and MAX16071 support an additional limit which is

configurable as either low or high secondary limit. MAX16065, MAX16066,

MAX16070, and MAX16071 also support supply current monitoring.





Usage Notes

-----------



This driver does not probe for devices, since there is no register which

can be safely used to identify the chip. You will have to instantiate

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

details.





Sysfs entries

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



in[0-11]_input		Input voltage measurements.



in12_input		Voltage on CSP (Current Sense Positive) pin.

			Only if the chip supports current sensing and if

			current sensing is enabled.



in[0-11]_min		Low warning limit.

			Supported on MAX16065, MAX16066, MAX16070, and MAX16071

			only.



in[0-11]_max		High warning limit.

			Supported on MAX16065, MAX16066, MAX16070, and MAX16071

			only.



			Either low or high warning limits are supported

			(depending on chip configuration), but not both.



in[0-11]_lcrit		Low critical limit.



in[0-11]_crit		High critical limit.



in[0-11]_alarm		Input voltage alarm.



curr1_input		Current sense input; only if the chip supports current

			sensing and if current sensing is enabled.

			Displayed current assumes 0.001 Ohm current sense

			resistor.



curr1_alarm		Overcurrent alarm; only if the chip supports current

			sensing and if current sensing is enabled.

Documentation/hwmon/max6642

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Kernel driver max6642

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



Supported chips:

  * Maxim MAX6642

    Prefix: 'max6642'

    Addresses scanned: I2C 0x48-0x4f

    Datasheet: Publicly available at the Maxim website

               http://datasheets.maxim-ic.com/en/ds/MAX6642.pdf



Authors:

        Per Dalen <per.dalen@appeartv.com>



Description

-----------



The MAX6642 is a digital temperature sensor. It senses its own temperature as

well as the temperature on one external diode.



All temperature values are given in degrees Celsius. Resolution

is 0.25 degree for the local temperature and for the remote temperature.

Documentation/hwmon/pkgtemp

deleted100644 → 0
+0 −36
Original line number Diff line number Diff line 
Kernel driver pkgtemp

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



Supported chips:

  * Intel family

    Prefix: 'pkgtemp'

    CPUID:

    Datasheet: Intel 64 and IA-32 Architectures Software Developer's Manual

               Volume 3A: System Programming Guide



Author: Fenghua Yu



Description

-----------



This driver permits reading package level temperature sensor embedded inside

Intel CPU package. The sensors can be in core, uncore, memory controller, or

other components in a package. The feature is first implemented in Intel Sandy

Bridge platform.



Temperature is measured in degrees Celsius and measurement resolution is

1 degree C. Valid temperatures are from 0 to TjMax degrees C, because the actual

value of temperature register is in fact a delta from TjMax.



Temperature known as TjMax is the maximum junction temperature of package.

We get this from MSR_IA32_TEMPERATURE_TARGET. If the MSR is not accessible,

we define TjMax as 100 degrees Celsius. At this temperature, protection

mechanism will perform actions to forcibly cool down the package. Alarm

may be raised, if the temperature grows enough (more than TjMax) to trigger

the Out-Of-Spec bit. Following table summarizes the exported sysfs files:



temp1_input	  - Package temperature (in millidegrees Celsius).

temp1_max        - All cooling devices should be turned on.

temp1_crit	  - Maximum junction temperature (in millidegrees Celsius).

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

		    Correct CPU operation is no longer guaranteed.