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

Commit cd66acb4 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 patches from Guenter Roeck:
 "Bug fixes for sht15 and ltc2978 driver plus some documentation
  updates"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (sht15) Check return value of regulator_enable()
  hwmon: (adt7410) Document ADT7420 support
  hwmon: (pmbus/ltc2978) Use detected chip ID to select supported functionality
  hwmon: (pmbus/ltc2978) Fix peak attribute handling
  hwmon: (pmbus/ltc2978) Update datasheet links
  hwmon: Update my e-mail address in driver documentation
parents 9f225788 3e78080f

Documentation/hwmon/adm1275

+1 −1
Original line number Original line Diff line number Diff line
@@ -15,7 +15,7 @@ Supported chips: 
    Addresses scanned: -

    Addresses scanned: -

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

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





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

Author: Guenter Roeck <linux@roeck-us.net>









Description

Description

Documentation/hwmon/adt7410

+10 −1
Original line number Original line Diff line number Diff line
@@ -4,9 +4,14 @@ Kernel driver adt7410 
Supported chips:

Supported chips:

  * Analog Devices ADT7410

  * Analog Devices ADT7410

    Prefix: 'adt7410'

    Prefix: 'adt7410'

    Addresses scanned: I2C 0x48 - 0x4B

    Addresses scanned: None

    Datasheet: Publicly available at the Analog Devices website

    Datasheet: Publicly available at the Analog Devices website

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

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

  * Analog Devices ADT7420

    Prefix: 'adt7420'

    Addresses scanned: None

    Datasheet: Publicly available at the Analog Devices website

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





Author: Hartmut Knaack <knaack.h@gmx.de>

Author: Hartmut Knaack <knaack.h@gmx.de>
@@ -27,6 +32,10 @@ value per second or even justget one sample on demand for power saving. 
Besides, it can completely power down its ADC, if power management is

Besides, it can completely power down its ADC, if power management is

required.

required.





The ADT7420 is register compatible, the only differences being the package,

a slightly narrower operating temperature range (-40°C to +150°C), and a

better accuracy (0.25°C instead of 0.50°C.)



Configuration Notes

Configuration Notes

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

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

Documentation/hwmon/jc42

+1 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,7 @@ Supported chips: 
    Addresses scanned: I2C 0x18 - 0x1f

    Addresses scanned: I2C 0x18 - 0x1f





Author:

Author:

	Guenter Roeck <guenter.roeck@ericsson.com>

	Guenter Roeck <linux@roeck-us.net>









Description

Description

Documentation/hwmon/lineage-pem

+1 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,7 @@ Supported devices: 
    Documentation:

    Documentation:

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

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





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

Author: Guenter Roeck <linux@roeck-us.net>









Description

Description

Documentation/hwmon/lm25066

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ Supported chips: 
    Datasheet:

    Datasheet:

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

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





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

Author: Guenter Roeck <linux@roeck-us.net>









Description

Description