Commit 7e752241 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 updates from Guenter Roeck:
 - new driver for HTU21D (humidity sensor)
 - add support for Fam16h (Kabini) to k10temp
 - add support for NCT6102D/6106D and NCT6791D to nct6775 driver
 - add support for ADS1115 to ads1015 driver
 - add support for hibernate to w83627ehf and nct6775 drivers
 - some minor cleanups

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (htu21) Add Measurement Specialties HTU21D support
  hwmon: Change my email address.
  hwmon: (k10temp) Add support for Fam16h (Kabini)
  hwmon: (adt7462) ADT7462_REG_VOLT_MAX() should return 0
  hwmon: (ads1015) Add support for ADS1115
  hwmon: (w83627ehf) Add support for hibernate
  hwmon: (nct6775) Add support for hibernate
  hwmon: use dev_get_platdata()
  hwmon: (nct6775) Fix size of data->temp array
  hwmon: (nct6775) Avoid using device platform data outside probe function
  hwmon: (nct6775) Add support for NCT6791D
  hwmon: (nct6775) Add support for beep attributes
  hwmon: (nct6775) Add support for critical low/high temperature limits on NCT6106
  hwmon: (nct6775) Add support for NCT6102D/6106D
  hwmon: (nct6775) Support two SuperIO chips in the same system
  hwmon: (nct6775) Allocate attributes dynamically from templates
  hwmon: (coretemp) Atom CPUs don't support TjMax; no warning needed
parents bebcb928 f060c658

Documentation/hwmon/ads1015

+6 −2
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ Supported chips: 
    Prefix: 'ads1015'

    Datasheet: Publicly available at the Texas Instruments website :

               http://focus.ti.com/lit/ds/symlink/ads1015.pdf

  * Texas Instruments ADS1115

    Prefix: 'ads1115'

    Datasheet: Publicly available at the Texas Instruments website :

               http://focus.ti.com/lit/ds/symlink/ads1115.pdf



Authors:

        Dirk Eibach, Guntermann & Drunck GmbH <eibach@gdsys.de>
@@ -13,9 +17,9 @@ Authors: 
Description

-----------



This driver implements support for the Texas Instruments ADS1015.

This driver implements support for the Texas Instruments ADS1015/ADS1115.



This device is a 12-bit A-D converter with 4 inputs.

This device is a 12/16-bit A-D converter with 4 inputs.



The inputs can be used single ended or in certain differential combinations.

Documentation/hwmon/htu21

0 → 100644
+46 −0
Original line number Diff line number Diff line 
Kernel driver htu21

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



Supported chips:

  * Measurement Specialties HTU21D

    Prefix: 'htu21'

    Addresses scanned: none

    Datasheet: Publicly available at the Measurement Specialties website

    http://www.meas-spec.com/downloads/HTU21D.pdf





Author:

  William Markezana <william.markezana@meas-spec.com>



Description

-----------



The HTU21D is a humidity and temperature sensor in a DFN package of

only 3 x 3 mm footprint and 0.9 mm height.



The devices communicate with the I2C protocol. All sensors are set to the

same I2C address 0x40, so an entry with I2C_BOARD_INFO("htu21", 0x40) can

be used in the board setup code.



This driver does not auto-detect devices. You will have to instantiate the

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

for details.



sysfs-Interface

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



temp1_input - temperature input

humidity1_input - humidity input



Notes

-----



The driver uses the default resolution settings of 12 bit for humidity and 14

bit for temperature, which results in typical measurement times of 11 ms for

humidity and 44 ms for temperature. To keep self heating below 0.1 degree

Celsius, the device should not be active for more than 10% of the time. For

this reason, the driver performs no more than two measurements per second and

reports cached information if polled more frequently.



Different resolutions, the on-chip heater, using the CRC checksum and reading

the serial number are not supported yet.

Documentation/hwmon/k10temp

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ Supported chips: 
* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)

* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)

* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"

* AMD Family 16h processors: "Kabini"



  Prefix: 'k10temp'

  Addresses scanned: PCI space

drivers/hwmon/Kconfig

+14 −4
Original line number Diff line number Diff line
@@ -296,8 +296,8 @@ config SENSORS_K10TEMP 
	  If you say yes here you get support for the temperature

	  sensor(s) inside your CPU. Supported are later revisions of

	  the AMD Family 10h and all revisions of the AMD Family 11h,

	  12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity)

	  microarchitectures.

	  12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and

	  16h (Kabini) microarchitectures.



	  This driver can also be built as a module.  If so, the module

	  will be called k10temp.
@@ -511,6 +511,16 @@ config SENSORS_HIH6130 
	  This driver can also be built as a module.  If so, the module

	  will be called hih6130.



config SENSORS_HTU21

	tristate "Measurement Specialties HTU21D humidity/temperature sensors"

	depends on I2C

	help

	  If you say yes here you get support for the Measurement Specialties

	  HTU21D humidity and temperature sensors.



	  This driver can also be built as a module.  If so, the module

	  will be called htu21.



config SENSORS_CORETEMP

	tristate "Intel Core/Core2/Atom temperature sensor"

	depends on X86
@@ -1202,8 +1212,8 @@ config SENSORS_ADS1015 
	tristate "Texas Instruments ADS1015"

	depends on I2C

	help

	  If you say yes here you get support for Texas Instruments ADS1015

	  12-bit 4-input ADC device.

	  If you say yes here you get support for Texas Instruments

	  ADS1015/ADS1115 12/16-bit 4-input ADC device.



	  This driver can also be built as a module.  If so, the module

	  will be called ads1015.

drivers/hwmon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o 
obj-$(CONFIG_SENSORS_GL520SM)	+= gl520sm.o

obj-$(CONFIG_SENSORS_GPIO_FAN)	+= gpio-fan.o

obj-$(CONFIG_SENSORS_HIH6130)	+= hih6130.o

obj-$(CONFIG_SENSORS_HTU21)	+= htu21.o

obj-$(CONFIG_SENSORS_ULTRA45)	+= ultra45_env.o

obj-$(CONFIG_SENSORS_I5K_AMB)	+= i5k_amb.o

obj-$(CONFIG_SENSORS_IBMAEM)	+= ibmaem.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE