Commit 31f67652 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull hwmon changes for v3.4 from Guenter Roeck:
 "Mostly cleanup.  No new drivers this time around, but support for
  several chips added to existing drivers: TPS40400, TPS40422, MTD040,
  MAX34446, ZL9101M, ZL9117M, and LM96080.  Also, added watchdog support
  for SCH56xx, and additional attributes for a couple of drivers."

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (137 commits)
  hwmon: (sch56xx) Add support for the integrated watchdog (v2)
  hwmon: (w83627ehf) Add support for temperature offset registers
  hwmon: (jc42) Remove unnecessary device IDs
  hwmon: (zl6100) Add support for ZL9101M and ZL9117M
  hwmon: (adm1275) Add support for ADM1075
  hwmon: (max34440) Add support for MAX34446
  hwmon: (pmbus) Add more virtual registers
  hwmon: (pmbus) Add support for Lineage Power MDT040
  hwmon: (pmbus) Add support for TI TPS40400 and TPS40422
  hwmon: (max34440) Add support for 'lowest' output voltage attribute
  hwmon: (jc42) Convert to use devm_kzalloc
  hwmon: (max16065) Convert to use devm_kzalloc
  hwmon: (smm665) Convert to use devm_kzalloc
  hwmon: (ltc4261) Convert to use devm_kzalloc
  hwmon: (pmbus) Simplify remove functions
  hwmon: (pmbus) Convert pmbus drivers to use devm_kzalloc
  hwmon: (lineage-pem) Convert to use devm_kzalloc
  hwmon: (hwmon-vid) Fix checkpatch issues
  hwmon: (hwmon-vid) Add new entries to VRM model table
  hwmon: (lm80) Add detection of NatSemi/TI LM96080
  ...
parents d15d7644 312869ec

Documentation/hwmon/adm1275

+23 −7
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ Kernel driver adm1275 
=====================



Supported chips:

  * Analog Devices ADM1075

    Prefix: 'adm1075'

    Addresses scanned: -

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

  * Analog Devices ADM1275

    Prefix: 'adm1275'

    Addresses scanned: -
@@ -17,13 +21,13 @@ Author: Guenter Roeck <guenter.roeck@ericsson.com> 
Description

-----------



This driver supports hardware montoring for Analog Devices ADM1275 and ADM1276

Hot-Swap Controller and Digital Power Monitor.

This driver supports hardware montoring for Analog Devices ADM1075, ADM1275,

and ADM1276 Hot-Swap Controller and Digital Power Monitor.



ADM1275 and ADM1276 are hot-swap controllers that allow a circuit board to be

removed from or inserted into a live backplane. They also feature current and

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

accessed using a PMBus interface.

ADM1075, ADM1275, and ADM1276 are hot-swap controllers that allow a circuit

board to be removed from or inserted into a live backplane. They also feature

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.
@@ -36,6 +40,10 @@ This driver does not auto-detect devices. You will have to instantiate the 
devices explicitly. Please see Documentation/i2c/instantiating-devices for

details.



The ADM1075, unlike many other PMBus devices, does not support internal voltage

or current scaling. Reported voltages, currents, and power are raw measurements,

and will typically have to be scaled.





Platform data support

---------------------
@@ -51,7 +59,8 @@ 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.

			configuration. On ADM1075, vout1 reports the voltage on

			the VAUX pin.

in1_input		Measured voltage.

in1_min			Minimum Voltage.

in1_max			Maximum voltage.
@@ -74,3 +83,10 @@ curr1_crit Critical maximum current. Depending on the chip 
curr1_crit_alarm	Critical current high alarm.

curr1_highest		Historical maximum current.

curr1_reset_history	Write any value to reset history.



power1_label		"pin1"

power1_input		Input power.

power1_reset_history	Write any value to reset history.



			Power attributes are supported on ADM1075 and ADM1276

			only.

Documentation/hwmon/jc42

+9 −30
Original line number Diff line number Diff line
@@ -3,71 +3,50 @@ Kernel driver jc42 


Supported chips:

  * Analog Devices ADT7408

    Prefix: 'adt7408'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://www.analog.com/static/imported-files/data_sheets/ADT7408.pdf

  * Atmel AT30TS00

    Prefix: 'at30ts00'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://www.atmel.com/Images/doc8585.pdf

  * IDT TSE2002B3, TSE2002GB2, TS3000B3, TS3000GB2

    Prefix: 'tse2002', 'ts3000'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://www.idt.com/sites/default/files/documents/IDT_TSE2002B3C_DST_20100512_120303152056.pdf

	http://www.idt.com/sites/default/files/documents/IDT_TSE2002GB2A1_DST_20111107_120303145914.pdf

	http://www.idt.com/sites/default/files/documents/IDT_TS3000B3A_DST_20101129_120303152013.pdf

	http://www.idt.com/sites/default/files/documents/IDT_TS3000GB2A1_DST_20111104_120303151012.pdf

  * Maxim MAX6604

    Prefix: 'max6604'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

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

  * Microchip MCP9804, MCP9805, MCP98242, MCP98243, MCP9843

    Prefixes: 'mcp9804', 'mcp9805', 'mcp98242', 'mcp98243', 'mcp9843'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf

	http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf

	http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf

	http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf

  * NXP Semiconductors SE97, SE97B

    Prefix: 'se97'

    Addresses scanned: I2C 0x18 - 0x1f

  * NXP Semiconductors SE97, SE97B, SE98, SE98A

    Datasheets:

	http://www.nxp.com/documents/data_sheet/SE97.pdf

	http://www.nxp.com/documents/data_sheet/SE97B.pdf

  * NXP Semiconductors SE98

    Prefix: 'se98'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://www.nxp.com/documents/data_sheet/SE98.pdf

	http://www.nxp.com/documents/data_sheet/SE98A.pdf

  * ON Semiconductor CAT34TS02, CAT6095

    Prefix: 'cat34ts02', 'cat6095'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheet:

	http://www.onsemi.com/pub_link/Collateral/CAT34TS02-D.PDF

	http://www.onsemi.com/pub/Collateral/CAT6095-D.PDF

  * ST Microelectronics STTS424, STTS424E02

    Prefix: 'stts424'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheets:

	http://www.st.com/stonline/products/literature/ds/13447/stts424.pdf

	http://www.st.com/stonline/products/literature/ds/13448/stts424e02.pdf

  * ST Microelectronics STTS2002, STTS3000

    Prefix: 'stts2002', 'stts3000'

    Addresses scanned: I2C 0x18 - 0x1f

  * ST Microelectronics STTS424, STTS424E02, STTS2002, STTS3000

    Datasheets:

	http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00157556.pdf

	http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00157558.pdf

	http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATASHEET/CD00225278.pdf

	http://www.st.com/internet/com/TECHNICAL_RESOURCES/TECHNICAL_LITERATURE/DATA_BRIEF/CD00270920.pdf

  * JEDEC JC 42.4 compliant temperature sensor chips

    Prefix: 'jc42'

    Addresses scanned: I2C 0x18 - 0x1f

    Datasheet:

	http://www.jedec.org/sites/default/files/docs/4_01_04R19.pdf



  Common for all chips:

    Prefix: 'jc42'

    Addresses scanned: I2C 0x18 - 0x1f



Author:

	Guenter Roeck <guenter.roeck@ericsson.com>

Documentation/hwmon/lm80

+8 −1
Original line number Diff line number Diff line
@@ -7,6 +7,11 @@ Supported chips: 
    Addresses scanned: I2C 0x28 - 0x2f

    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/

  * National Semiconductor LM96080

    Prefix: 'lm96080'

    Addresses scanned: I2C 0x28 - 0x2f

    Datasheet: Publicly available at the National Semiconductor website

               http://www.national.com/



Authors:

        Frodo Looijaard <frodol@dds.nl>,
@@ -17,7 +22,9 @@ Description 


This driver implements support for the National Semiconductor LM80.

It is described as a 'Serial Interface ACPI-Compatible Microprocessor

System Hardware Monitor'.

System Hardware Monitor'. The LM96080 is a more recent incarnation,

it is pin and register compatible, with a few additional features not

yet supported by the driver.



The LM80 implements one temperature sensor, two fan rotation speed sensors,

seven voltage sensors, alarms, and some miscellaneous stuff.

Documentation/hwmon/max34440

+28 −2
Original line number Diff line number Diff line
@@ -11,6 +11,11 @@ Supported chips: 
    Prefixes: 'max34441'

    Addresses scanned: -

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

  * Maxim MAX34446

    PMBus Power-Supply Data Logger

    Prefixes: 'max34446'

    Addresses scanned: -

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



Author: Guenter Roeck <guenter.roeck@ericsson.com>
@@ -19,8 +24,8 @@ Description 
-----------



This driver supports hardware montoring for Maxim MAX34440 PMBus 6-Channel

Power-Supply Manager and MAX34441 PMBus 5-Channel Power-Supply Manager

and Intelligent Fan Controller.

Power-Supply Manager, MAX34441 PMBus 5-Channel Power-Supply Manager

and Intelligent Fan Controller, and MAX34446 PMBus Power-Supply Data Logger.



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

Documentation/hwmon/pmbus for details on PMBus client drivers.
@@ -33,6 +38,13 @@ This driver does not auto-detect devices. You will have to instantiate the 
devices explicitly. Please see Documentation/i2c/instantiating-devices for

details.



For MAX34446, the value of the currX_crit attribute determines if current or

voltage measurement is enabled for a given channel. Voltage measurement is

enabled if currX_crit is set to 0; current measurement is enabled if the

attribute is set to a positive value. Power measurement is only enabled if

channel 1 (3) is configured for voltage measurement, and channel 2 (4) is

configured for current measurement.





Platform data support

---------------------
@@ -56,19 +68,31 @@ in[1-6]_min_alarm Voltage low alarm. From VOLTAGE_UV_WARNING status. 
in[1-6]_max_alarm	Voltage high alarm. From VOLTAGE_OV_WARNING status.

in[1-6]_lcrit_alarm	Voltage critical low alarm. From VOLTAGE_UV_FAULT status.

in[1-6]_crit_alarm	Voltage critical high alarm. From VOLTAGE_OV_FAULT status.

in[1-6]_lowest		Historical minimum voltage.

in[1-6]_highest		Historical maximum voltage.

in[1-6]_reset_history	Write any value to reset history.



			MAX34446 only supports in[1-4].



curr[1-6]_label		"iout[1-6]".

curr[1-6]_input		Measured current. From READ_IOUT register.

curr[1-6]_max		Maximum current. From IOUT_OC_WARN_LIMIT register.

curr[1-6]_crit		Critical maximum current. From IOUT_OC_FAULT_LIMIT register.

curr[1-6]_max_alarm	Current high alarm. From IOUT_OC_WARNING status.

curr[1-6]_crit_alarm	Current critical high alarm. From IOUT_OC_FAULT status.

curr[1-4]_average	Historical average current (MAX34446 only).

curr[1-6]_highest	Historical maximum current.

curr[1-6]_reset_history	Write any value to reset history.



			in6 and curr6 attributes only exist for MAX34440.

			MAX34446 only supports curr[1-4].



power[1,3]_label	"pout[1,3]"

power[1,3]_input	Measured power.

power[1,3]_average	Historical average power.

power[1,3]_highest	Historical maximum power.



			Power attributes only exist for MAX34446.



temp[1-8]_input		Measured temperatures. From READ_TEMPERATURE_1 register.

			temp1 is the chip's internal temperature. temp2..temp5
@@ -79,7 +103,9 @@ temp[1-8]_max Maximum temperature. From OT_WARN_LIMIT register. 
temp[1-8]_crit		Critical high temperature. From OT_FAULT_LIMIT register.

temp[1-8]_max_alarm	Temperature high alarm.

temp[1-8]_crit_alarm	Temperature critical high alarm.

temp[1-8]_average	Historical average temperature (MAX34446 only).

temp[1-8]_highest	Historical maximum temperature.

temp[1-8]_reset_history	Write any value to reset history.



			temp7 and temp8 attributes only exist for MAX34440.

			MAX34446 only supports temp[1-3].

Documentation/hwmon/pmbus

+8 −1
Original line number Diff line number Diff line
@@ -15,13 +15,20 @@ Supported chips: 
	http://www.onsemi.com/pub_link/Collateral/NCP4200-D.PDF

	http://www.onsemi.com/pub_link/Collateral/JUNE%202009-%20REV.%200.PDF

  * Lineage Power

    Prefixes: 'pdt003', 'pdt006', 'pdt012', 'udt020'

    Prefixes: 'mdt040', 'pdt003', 'pdt006', 'pdt012', 'udt020'

    Addresses scanned: -

    Datasheets:

	http://www.lineagepower.com/oem/pdf/PDT003A0X.pdf

	http://www.lineagepower.com/oem/pdf/PDT006A0X.pdf

	http://www.lineagepower.com/oem/pdf/PDT012A0X.pdf

	http://www.lineagepower.com/oem/pdf/UDT020A0X.pdf

	http://www.lineagepower.com/oem/pdf/MDT040A0X.pdf

  * Texas Instruments TPS40400, TPS40422

    Prefixes: 'tps40400', 'tps40422'

    Addresses scanned: -

    Datasheets:

	http://www.ti.com/lit/gpn/tps40400

	http://www.ti.com/lit/gpn/tps40422

  * Generic PMBus devices

    Prefix: 'pmbus'

    Addresses scanned: -

CRA Git | Maintained and supported by SUSTech CRA and CCSE