Commit 2634bf25 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v4.5' of... 

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

Pull hwmon updates from Guenter Roeck:
 "Notable hwmon changes:

   - Add basic support for NCT6683 on Mitac boards
   - Add support for AMD new 15h processors to fam15h_power driver
   - Add pmbus client driver for LTC3815
   - Remove htu21 driver (now supported by iio subsystem)"

* tag 'hwmon-for-linus-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (nct6683) Add basic support for NCT6683 on Mitac boards
  hwmon: (ibmaem) constify aem_rw_sensor_template and aem_ro_sensor_template structures
  hwmon: (nct6683,nct6775) constify sensor_template_group structures
  MAINTAINERS: change the maintainer of fam15h_power driver
  hwmon: (fam15h_power) Add support for AMD new 15h processors
  hwmon: (pmbus) Add client driver for LTC3815
  hwmon: (htu21) Remove driver
parents e795e5f4 91918d13

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -1507,6 +1507,14 @@ S: 312/107 Canberra Avenue 
S: Griffith, ACT 2603 

S: Australia



N: Andreas Herrmann

E: herrmann.der.user@gmail.com

E: herrmann.der.user@googlemail.com

D: Key developer of x86/AMD64

D: Author of AMD family 15h processor power monitoring driver

D: Maintainer of AMD Athlon 64 and Opteron processor frequency driver

S: Germany



N: Sebastian Hetze

E: she@lunetix.de

D: German Linux Documentation,

Documentation/hwmon/htu21

deleted100644 → 0
+0 −46
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/ltc3815

0 → 100644
+61 −0
Original line number Diff line number Diff line 
Kernel driver ltc3815

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



Supported chips:

  * Linear Technology LTC3815

    Prefix: 'ltc3815'

    Addresses scanned: -

    Datasheet: http://www.linear.com/product/ltc3815



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





Description

-----------



LTC3815 is a Monolithic Synchronous DC/DC Step-Down Converter.





Usage Notes

-----------



This driver does not probe for PMBus devices. You will have to instantiate

devices explicitly.



Example: the following commands will load the driver for an LTC3815

at address 0x20 on I2C bus #1:



# modprobe ltc3815

# echo ltc3815 0x20 > /sys/bus/i2c/devices/i2c-1/new_device





Sysfs attributes

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



in1_label		"vin"

in1_input		Measured input voltage.

in1_alarm		Input voltage alarm.

in1_highest		Highest input voltage.

in1_reset_history	Reset input voltage history.



in2_label		"vout1".

in2_input		Measured output voltage.

in2_alarm		Output voltage alarm.

in2_highest		Highest output voltage.

in2_reset_history	Reset output voltage history.



temp1_input		Measured chip temperature.

temp1_alarm		Temperature alarm.

temp1_highest		Highest measured temperature.

temp1_reset_history	Reset temperature history.



curr1_label		"iin".

curr1_input		Measured input current.

curr1_highest		Highest input current.

curr1_reset_history	Reset input current history.



curr2_label		"iout1".

curr2_input		Measured output current.

curr2_alarm		Output current alarm.

curr2_highest		Highest output current.

curr2_reset_history	Reset output current history.

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -614,9 +614,9 @@ F: drivers/crypto/ccp/ 
F:	include/linux/ccp.h



AMD FAM15H PROCESSOR POWER MONITORING DRIVER

M:	Andreas Herrmann <herrmann.der.user@googlemail.com>

M:	Huang Rui <ray.huang@amd.com>

L:	lm-sensors@lm-sensors.org

S:	Maintained

S:	Supported

F:	Documentation/hwmon/fam15h_power

F:	drivers/hwmon/fam15h_power.c

drivers/hwmon/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -859,16 +859,6 @@ config SENSORS_MAX31790 
	  This driver can also be built as a module.  If so, the module

	  will be called max31790.



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_MCP3021

	tristate "Microchip MCP3021 and compatibles"

	depends on I2C

CRA Git | Maintained and supported by SUSTech CRA and CCSE