Commit 24d734a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus-v4.13-rc1' of... 

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

Pull hwmon updates from Guenter Roeck:

 - Add PMBus client driver for IR35221

 - Add support for NCT6795D to nct6775 driver

 - Functional improvements to adt7475, aspeed-pwm-tacho, and ibmpowernv
   drivers

 - Minor fixes and cleanups in various drivers

* tag 'hwmon-for-linus-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (22 commits)
  hwmon: (aspeed-pwm-tacho) Poll with short sleeps.
  hwmon: (aspeed-pwm-tacho) reduce fan_tach period
  hwmon: (ibmpowernv) Add current(A) sensor
  hwmon: (ibmpowernv) introduce a legacy_compatibles array
  hwmon: (pwm-fan) Switch to new atomic PWM API
  hwmon: (scpi) Fix the scale of SCP sensor readings
  hwmon: (aspeed-pwm-tacho) Enable both edge measurement.
  hwmon: (ibmpowernv) Add highest/lowest attributes to sensors
  hwmon: (pmbus) move header file out of I2C realm
  hwmon: (max6639) move header file out of I2C realm
  hwmon: (ltc4245) move header file out of I2C realm
  hwmon: (ds620) move header file out of I2C realm
  hwmon: (ads1015) move header file out of I2C realm
  hwmon: (adt7475) temperature smoothing
  hwmon: (adt7475) add high frequency support
  hwmon: (adt7475) fan stall prevention
  hwmon: (adt7475) replace find_nearest() with find_closest()
  hwmon: (pmbus) Add client driver for IR35221
  hwmon: (nct6775) Add support for NCT6795D
  hwmon: (nct6775) Improve fan detection
  ...
parents 17ece345 44b41366

Documentation/hwmon/ads1015

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ By default all inputs are exported. 
Platform Data

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



In linux/i2c/ads1015.h platform data is defined, channel_data contains

In linux/platform_data/ads1015.h platform data is defined, channel_data contains

configuration data for the used input combinations:

- pga is the programmable gain amplifier (values are full scale)

  0: +/- 6.144 V

Documentation/hwmon/adt7475

+9 −0
Original line number Diff line number Diff line
@@ -109,6 +109,15 @@ fan speed) is applied. PWM values range from 0 (off) to 255 (full speed). 
Fan speed may be set to maximum when the temperature sensor associated with

the PWM control exceeds temp#_max.



At Tmin - hysteresis the PWM output can either be off (0% duty cycle) or at the

minimum (i.e. auto_point1_pwm). This behaviour can be configured using the

pwm[1-*]_stall_disable sysfs attribute. A value of 0 means the fans will shut

off. A value of 1 means the fans will run at auto_point1_pwm.



The responsiveness of the ADT747x to temperature changes can be configured.

This allows smoothing of the fan speed transition. To set the transition time

set the value in ms in the temp[1-*]_smoothing sysfs attribute.



Notes

-----

Documentation/hwmon/ir35221

0 → 100644
+87 −0
Original line number Diff line number Diff line 
Kernel driver ir35221

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



Supported chips:

  * Infinion IR35221

    Prefix: 'ir35221'

    Addresses scanned: -

    Datasheet: Datasheet is not publicly available.



Author: Samuel Mendoza-Jonas <sam@mendozajonas.com>





Description

-----------



IR35221 is a Digital DC-DC Multiphase 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 IR35221

at address 0x70 on I2C bus #4:



# modprobe ir35221

# echo ir35221 0x70 > /sys/bus/i2c/devices/i2c-4/new_device





Sysfs attributes

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



curr1_label		"iin"

curr1_input		Measured input current

curr1_max		Maximum current

curr1_max_alarm		Current high alarm



curr[2-3]_label		"iout[1-2]"

curr[2-3]_input		Measured output current

curr[2-3]_crit		Critical maximum current

curr[2-3]_crit_alarm	Current critical high alarm

curr[2-3]_highest	Highest output current

curr[2-3]_lowest	Lowest output current

curr[2-3]_max		Maximum current

curr[2-3]_max_alarm	Current high alarm



in1_label		"vin"

in1_input		Measured input voltage

in1_crit		Critical maximum input voltage

in1_crit_alarm		Input voltage critical high alarm

in1_highest		Highest input voltage

in1_lowest		Lowest input voltage

in1_min			Minimum input voltage

in1_min_alarm		Input voltage low alarm



in[2-3]_label		"vout[1-2]"

in[2-3]_input		Measured output voltage

in[2-3]_lcrit		Critical minimum output voltage

in[2-3]_lcrit_alarm	Output voltage critical low alarm

in[2-3]_crit		Critical maximum output voltage

in[2-3]_crit_alarm	Output voltage critical high alarm

in[2-3]_highest		Highest output voltage

in[2-3]_lowest		Lowest output voltage

in[2-3]_max		Maximum output voltage

in[2-3]_max_alarm	Output voltage high alarm

in[2-3]_min		Minimum output voltage

in[2-3]_min_alarm	Output voltage low alarm



power1_label		"pin"

power1_input		Measured input power

power1_alarm		Input power high alarm

power1_max		Input power limit



power[2-3]_label	"pout[1-2]"

power[2-3]_input	Measured output power

power[2-3]_max		Output power limit

power[2-3]_max_alarm	Output power high alarm



temp[1-2]_input		Measured temperature

temp[1-2]_crit		Critical high temperature

temp[1-2]_crit_alarm	Chip temperature critical high alarm

temp[1-2]_highest	Highest temperature

temp[1-2]_lowest	Lowest temperature

temp[1-2]_max		Maximum temperature

temp[1-2]_max_alarm	Chip temperature high alarm

Documentation/hwmon/ltc4245

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ slowly, -EAGAIN will be returned when you read the sysfs attribute containing 
the sensor reading.



The LTC4245 chip can be configured to sample all GPIO pins with two methods:

1) platform data -- see include/linux/i2c/ltc4245.h

1) platform data -- see include/linux/platform_data/ltc4245.h

2) OF device tree -- add the "ltc4245,use-extra-gpios" property to each chip



The default mode of operation is to sample a single GPIO pin.

Documentation/hwmon/pmbus-core

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ Specifically, it provides the following information. 
PMBus driver platform data

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



PMBus platform data is defined in include/linux/i2c/pmbus.h. Platform data

PMBus platform data is defined in include/linux/pmbus.h. Platform data

currently only provides a flag field with a single bit used.



#define PMBUS_SKIP_STATUS_CHECK (1 << 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE