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

Commit 177808cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-3.19' of... 

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

Pull hwmon updates from Guenter Roeck:
 "Notable changes:
   - new driver for NCT7802Y
   - support for TMP435, LM95233, LM95235, NCT6792D, and NXP LM75B
   - regulator support for PMBus chips, specifically LTX2978
   - support for humidity sensors to iio-hwmon bridge driver

* tag 'hwmon-for-linus-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (21 commits)
  hwmon: (tmp401) Detect TMP435 on all addresses it supports
  hwmon: (lm75) Strengthen detect function
  hwmon: (gpio-fan) Add a shutdown handler to poweroff the fans
  hwmon: (gpio-fan) Allow usage of gpio operations that may sleep
  hwmon: (tmp401) Bail out from tmp401_probe() in case of write errors
  hwmon: (tmp401) Add support for TI TMP435
  hwmon: (lm95234) Add support for LM95233
  hwmon: (lm95245) Add support for LM95235
  hwmon: (ina2xx) bail-out from ina2xx_probe() in case of configuration errors
  hwmon: (nct6775) Add blank lines after declarations
  hwmon: (nct6775) Add support for NCT6792D
  hwmon: (nct6775) Documentation updates
  hwmon: (lm75) Add support for the NXP LM75B
  hwmon: Driver for Nuvoton NCT7802Y
  hwmon: (ibmpowernv) Convert to module_platform_driver
  hwmon: (ibmpowernv) Use platform 'id_table' to probe the device
  hwmon: (iio_hwmon) Add support for humidity sensors
  hwmon: (ltc2978) Add regulator support
  hwmon: (pmbus) Add regulator support
  hwmon: (pmbus) add helpers for byte write and read modify write
  ...
parents 0160928e 907a6d58

Documentation/devicetree/bindings/hwmon/ltc2978.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
ltc2978



Required properties:

- compatible: should contain one of:

  * "lltc,ltc2974"

  * "lltc,ltc2977"

  * "lltc,ltc2978"

  * "lltc,ltc3880"

  * "lltc,ltc3883"

  * "lltc,ltm4676"

- reg: I2C slave address



Optional properties:

- regulators: A node that houses a sub-node for each regulator controlled by

  the device. Each sub-node is identified using the node's name, with valid

  values listed below. The content of each sub-node is defined by the

  standard binding for regulators; see regulator.txt.



Valid names of regulators depend on number of supplies supported per device:

  * ltc2974 : vout0 - vout3

  * ltc2977 : vout0 - vout7

  * ltc2978 : vout0 - vout7

  * ltc3880 : vout0 - vout1

  * ltc3883 : vout0

  * ltm4676 : vout0 - vout1



Example:

ltc2978@5e {

	compatible = "lltc,ltc2978";

	reg = <0x5e>;

	regulators {

		vout0 {

			regulator-name = "FPGA-2.5V";

		};

		vout2 {

			regulator-name = "FPGA-1.5V";

		};

	};

};

Documentation/hwmon/lm75

+5 −0
Original line number Diff line number Diff line
@@ -53,6 +53,11 @@ Supported chips: 
               http://www.ti.com/product/tmp75

               http://www.ti.com/product/tmp175

               http://www.ti.com/product/tmp275

  * NXP LM75B

    Prefix: 'lm75b'

    Addresses scanned: none

    Datasheet: Publicly available at the NXP website

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



Author: Frodo Looijaard <frodol@dds.nl>

Documentation/hwmon/lm95234

+10 −5
Original line number Diff line number Diff line
@@ -2,6 +2,10 @@ Kernel driver lm95234 
=====================



Supported chips:

  * National Semiconductor / Texas Instruments LM95233

    Addresses scanned: I2C 0x18, 0x2a, 0x2b

    Datasheet: Publicly available at the Texas Instruments website

               http://www.ti.com/product/lm95233

  * National Semiconductor / Texas Instruments LM95234

    Addresses scanned: I2C 0x18, 0x4d, 0x4e

    Datasheet: Publicly available at the Texas Instruments website
@@ -13,11 +17,12 @@ Author: Guenter Roeck <linux@roeck-us.net> 
Description

-----------



LM95234 is an 11-bit digital temperature sensor with a 2-wire System Management

Bus (SMBus) interface and TrueTherm technology that can very accurately monitor

the temperature of four remote diodes as well as its own temperature.

The four remote diodes can be external devices such as microprocessors,

graphics processors or diode-connected 2N3904s. The LM95234's TruTherm

LM95233 and LM95234 are 11-bit digital temperature sensors with a 2-wire

System Management Bus (SMBus) interface and TrueTherm technology

that can very accurately monitor the temperature of two (LM95233)

or four (LM95234) remote diodes as well as its own temperature.

The remote diodes can be external devices such as microprocessors,

graphics processors or diode-connected 2N3904s. The chip's TruTherm

beta compensation technology allows sensing of 90 nm or 65 nm process

thermal diodes accurately.

Documentation/hwmon/lm95245

+9 −5
Original line number Diff line number Diff line
@@ -2,10 +2,14 @@ Kernel driver lm95245 
==================



Supported chips:

  * National Semiconductor LM95245

  * TI LM95235

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

    Datasheet: Publicly available at the TI website

               http://www.ti.com/lit/ds/symlink/lm95235.pdf

  * TI / 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

    Datasheet: Publicly available at the TI website

               http://www.ti.com/lit/ds/symlink/lm95245.pdf





Author: Alexander Stein <alexander.stein@systec-electronic.com>
@@ -13,10 +17,10 @@ Author: Alexander Stein <alexander.stein@systec-electronic.com> 
Description

-----------



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

LM95235 and LM95245 are 11-bit digital temperature sensors 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

The chips 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

Documentation/hwmon/nct6775

+13 −1
Original line number Diff line number Diff line
@@ -8,11 +8,15 @@ Kernel driver NCT6775 
=====================



Supported chips:

  * Nuvoton NCT6102D/NCT6104D/NCT6106D

    Prefix: 'nct6106'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Available from the Nuvoton web site

  * Nuvoton NCT5572D/NCT6771F/NCT6772F/NCT6775F/W83677HG-I

    Prefix: 'nct6775'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Available from Nuvoton upon request

  * Nuvoton NCT5577D/NCT6776D/NCT6776F

  * Nuvoton NCT5573D/NCT5577D/NCT6776D/NCT6776F

    Prefix: 'nct6776'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Available from Nuvoton upon request
@@ -20,6 +24,14 @@ Supported chips: 
    Prefix: 'nct6779'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Available from Nuvoton upon request

  * Nuvoton NCT6791D

    Prefix: 'nct6791'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Available from Nuvoton upon request

  * Nuvoton NCT6792D

    Prefix: 'nct6792'

    Addresses scanned: ISA address retrieved from Super I/O registers

    Datasheet: Available from Nuvoton upon request



Authors:

        Guenter Roeck <linux@roeck-us.net>