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

Commit 71219b34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull hwmon updates from Guenter Roeck:

 - added chip support: new Centaur CPUs, ADM1272, NCT6796D

 - ucd9000: added debugfs attributes, gpio support

 - cleanup and minor bug fixes

* tag 'hwmon-for-linus-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (via-cputemp) support new centaur CPUs
  hwmon: (nct6775) Fix writing pwmX_mode
  hwmon: (lm92) Add max6635 to lm92_id[]
  hwmon: (pmbus/adm1275) Add support for ADM1272
  hwmon: (lm92) Do not try to detect MAX6635
  hwmon: (ucd9000) Add debugfs attributes to provide mfr_status
  hwmon: (ucd9000) Add gpio chip interface
  hwmon: (nct6775) Add support for NCT6796D
  hwmon: (nct6775) Initialize boolean variables with declaration
  hwmon: (nct6775) Improve fan6/pwm6 support
  hwmon: (nct6775) Use NUM_FAN consistently
  hwmon: (g762) handle cleanup with devm_add_action
  hwmon: (sht3x) Update data sheet URL
  hwmon: (sht21) Update data sheet URLs
  hwmon: (pmbus/adm1275) Accept negative page register values
  hwmon: (pmbus/max8688) Accept negative page register values
parents c18bb396 e3a2d2be

Documentation/hwmon/adm1275

+12 −8
Original line number Diff line number Diff line
@@ -6,6 +6,10 @@ Supported chips: 
    Prefix: 'adm1075'

    Addresses scanned: -

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

  * Analog Devices ADM1272

    Prefix: 'adm1272'

    Addresses scanned: -

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

  * Analog Devices ADM1275

    Prefix: 'adm1275'

    Addresses scanned: -
@@ -29,11 +33,11 @@ Author: Guenter Roeck <linux@roeck-us.net> 
Description

-----------



This driver supports hardware monitoring for Analog Devices ADM1075, ADM1275,

ADM1276, ADM1278, ADM1293, and ADM1294 Hot-Swap Controller and Digital

Power Monitors.

This driver supports hardware monitoring for Analog Devices ADM1075, ADM1272,

ADM1275, ADM1276, ADM1278, ADM1293, and ADM1294 Hot-Swap Controller and

Digital Power Monitors.



ADM1075, ADM1275, ADM1276, ADM1278, ADM1293, and ADM1294 are hot-swap

ADM1075, ADM1272, ADM1275, ADM1276, ADM1278, ADM1293, and ADM1294 are hot-swap

controllers that allow a circuit board to be removed from or inserted into

a live backplane. They also feature current and voltage readback via an

integrated 12 bit analog-to-digital converter (ADC), accessed using a
@@ -100,11 +104,10 @@ power1_input_lowest Lowest observed input power. ADM1293 and ADM1294 only. 
power1_input_highest	Highest observed input power.

power1_reset_history	Write any value to reset history.



			Power attributes are supported on ADM1075, ADM1276,

			ADM1293, and ADM1294.

			Power attributes are supported on ADM1075, ADM1272,

			ADM1276, ADM1293, and ADM1294.



temp1_input		Chip temperature.

			Temperature attributes are only available on ADM1278.

temp1_max		Maximum chip temperature.

temp1_max_alarm		Temperature alarm.

temp1_crit		Critical chip temperature.
@@ -112,4 +115,5 @@ temp1_crit_alarm Critical temperature high alarm. 
temp1_highest		Highest observed temperature.

temp1_reset_history	Write any value to reset history.



			Temperature attributes are supported on ADM1278.
 
			Temperature attributes are supported on ADM1272 and

			ADM1278.

Documentation/hwmon/lm92

+2 −4
Original line number Diff line number Diff line
@@ -11,10 +11,8 @@ Supported chips: 
    Addresses scanned: none, force parameter needed

    Datasheet: http://www.national.com/pf/LM/LM76.html

  * Maxim MAX6633/MAX6634/MAX6635

    Prefix: 'lm92'

    Addresses scanned: I2C 0x48 - 0x4b

    MAX6633 with address in 0x40 - 0x47, 0x4c - 0x4f needs force parameter

    and MAX6634 with address in 0x4c - 0x4f needs force parameter

    Prefix: 'max6635'

    Addresses scanned: none, force parameter needed

    Datasheet: http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3074



Authors:

Documentation/hwmon/nct6775

+32 −24
Original line number Diff line number Diff line
@@ -36,6 +36,14 @@ Supported chips: 
    Prefix: 'nct6793'

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

    Datasheet: Available from Nuvoton upon request

  * Nuvoton NCT6795D

    Prefix: 'nct6795'

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

    Datasheet: Available from Nuvoton upon request

  * Nuvoton NCT6796D

    Prefix: 'nct6796'

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

    Datasheet: Available from Nuvoton upon request



Authors:

        Guenter Roeck <linux@roeck-us.net>
@@ -88,10 +96,10 @@ The mode works for fan1-fan5. 
sysfs attributes

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



pwm[1-5] - this file stores PWM duty cycle or DC value (fan speed) in range:

pwm[1-7] - this file stores PWM duty cycle or DC value (fan speed) in range:

	   0 (lowest speed) to 255 (full)



pwm[1-5]_enable - this file controls mode of fan/temperature control:

pwm[1-7]_enable - this file controls mode of fan/temperature control:

	* 0 Fan control disabled (fans set to maximum speed)

	* 1 Manual mode, write to pwm[0-5] any value 0-255

	* 2 "Thermal Cruise" mode
@@ -99,16 +107,16 @@ pwm[1-5]_enable - this file controls mode of fan/temperature control: 
	* 4 "Smart Fan III" mode (NCT6775F only)

	* 5 "Smart Fan IV" mode



pwm[1-5]_mode - controls if output is PWM or DC level

pwm[1-7]_mode - controls if output is PWM or DC level

        * 0 DC output

        * 1 PWM output



Common fan control attributes

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



pwm[1-5]_temp_sel	Temperature source. Value is temperature sensor index.

pwm[1-7]_temp_sel	Temperature source. Value is temperature sensor index.

			For example, select '1' for temp1_input.

pwm[1-5]_weight_temp_sel

pwm[1-7]_weight_temp_sel

			Secondary temperature source. Value is temperature

			sensor index. For example, select '1' for temp1_input.

			Set to 0 to disable secondary temperature control.
@@ -116,16 +124,16 @@ pwm[1-5]_weight_temp_sel 
If secondary temperature functionality is enabled, it is controlled with the

following attributes.



pwm[1-5]_weight_duty_step

pwm[1-7]_weight_duty_step

			Duty step size.

pwm[1-5]_weight_temp_step

pwm[1-7]_weight_temp_step

			Temperature step size. With each step over

			temp_step_base, the value of weight_duty_step is added

			to the current pwm value.

pwm[1-5]_weight_temp_step_base

pwm[1-7]_weight_temp_step_base

			Temperature at which secondary temperature control kicks

			in.

pwm[1-5]_weight_temp_step_tol

pwm[1-7]_weight_temp_step_tol

			Temperature step tolerance.



Thermal Cruise mode (2)
@@ -133,9 +141,9 @@ Thermal Cruise mode (2) 


If the temperature is in the range defined by:



pwm[1-5]_target_temp	Target temperature, unit millidegree Celsius

pwm[1-7]_target_temp	Target temperature, unit millidegree Celsius

			(range 0 - 127000)

pwm[1-5]_temp_tolerance

pwm[1-7]_temp_tolerance

			Target temperature tolerance, unit millidegree Celsius



there are no changes to fan speed. Once the temperature leaves the interval, fan
@@ -143,14 +151,14 @@ speed increases (if temperature is higher that desired) or decreases (if 
temperature is lower than desired), using the following limits and time

intervals.



pwm[1-5]_start		fan pwm start value (range 1 - 255), to start fan

pwm[1-7]_start		fan pwm start value (range 1 - 255), to start fan

			when the temperature is above defined range.

pwm[1-5]_floor		lowest fan pwm (range 0 - 255) if temperature is below

pwm[1-7]_floor		lowest fan pwm (range 0 - 255) if temperature is below

			the defined range. If set to 0, the fan is expected to

			stop if the temperature is below the defined range.

pwm[1-5]_step_up_time	milliseconds before fan speed is increased

pwm[1-5]_step_down_time	milliseconds before fan speed is decreased

pwm[1-5]_stop_time	how many milliseconds must elapse to switch

pwm[1-7]_step_up_time	milliseconds before fan speed is increased

pwm[1-7]_step_down_time	milliseconds before fan speed is decreased

pwm[1-7]_stop_time	how many milliseconds must elapse to switch

			corresponding fan off (when the temperature was below

			defined range).
@@ -159,8 +167,8 @@ Speed Cruise mode (3) 


This modes tries to keep the fan speed constant.



fan[1-5]_target		Target fan speed

fan[1-5]_tolerance

fan[1-7]_target		Target fan speed

fan[1-7]_tolerance

			Target speed tolerance
@@ -177,19 +185,19 @@ points should be set to higher temperatures and higher pwm values to achieve 
higher fan speeds with increasing temperature. The last data point reflects

critical temperature mode, in which the fans should run at full speed.



pwm[1-5]_auto_point[1-7]_pwm

pwm[1-7]_auto_point[1-7]_pwm

			pwm value to be set if temperature reaches matching

			temperature range.

pwm[1-5]_auto_point[1-7]_temp

pwm[1-7]_auto_point[1-7]_temp

			Temperature over which the matching pwm is enabled.

pwm[1-5]_temp_tolerance

pwm[1-7]_temp_tolerance

			Temperature tolerance, unit millidegree Celsius

pwm[1-5]_crit_temp_tolerance

pwm[1-7]_crit_temp_tolerance

			Temperature tolerance for critical temperature,

			unit millidegree Celsius



pwm[1-5]_step_up_time	milliseconds before fan speed is increased

pwm[1-5]_step_down_time	milliseconds before fan speed is decreased

pwm[1-7]_step_up_time	milliseconds before fan speed is increased

pwm[1-7]_step_down_time	milliseconds before fan speed is decreased



Usage Notes

-----------

Documentation/hwmon/sht21

+3 −3
Original line number Diff line number Diff line
@@ -6,13 +6,13 @@ Supported chips: 
    Prefix: 'sht21'

    Addresses scanned: none

    Datasheet: Publicly available at the Sensirion website

    http://www.sensirion.com/en/pdf/product_information/Datasheet-humidity-sensor-SHT21.pdf

    http://www.sensirion.com/file/datasheet_sht21



  * Sensirion SHT25

    Prefix: 'sht21'

    Prefix: 'sht25'

    Addresses scanned: none

    Datasheet: Publicly available at the Sensirion website

    http://www.sensirion.com/en/pdf/product_information/Datasheet-humidity-sensor-SHT25.pdf

    http://www.sensirion.com/file/datasheet_sht25



Author:

  Urs Fleisch <urs.fleisch@sensirion.com>

Documentation/hwmon/sht3x

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Supported chips: 
  * Sensirion SHT3x-DIS

    Prefix: 'sht3x'

    Addresses scanned: none

    Datasheet: http://www.sensirion.com/fileadmin/user_upload/customers/sensirion/Dokumente/Humidity/Sensirion_Humidity_Datasheet_SHT3x_DIS.pdf

    Datasheet: https://www.sensirion.com/file/datasheet_sht3x_digital



Author:

  David Frey <david.frey@sensirion.com>