Commit 19520fc1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: (44 commits)
  hwmon: (lineage-pem): Fix in1 voltage alarm sysfs attributes
  hwmon/f71882fg: Add support for f71808e
  hwmon/f71882fg: Add support for f71869f and f71869e
  hwmon/f71882fg: Add support for f71889ed
  hwmon/f71882fg: Break out test for auto pwm's controlled by digital readings
  hwmon/f71882fg: Separate temp beep sysfs attr from the other temp sysfs attr
  hwmon/f71882fg: Remove bogus temp2_type for certain models
  hwmon/f71882fg: Make number of temps configurable
  hwmon/f71882fg: Make creation of in sysfs attributes more generic
  hwmon/f71882fg: Only allow negative auto point temps if fan_neg_temp is enabled
  hwmon/f71882fg: Fix temp1 sensor type reporting
  hwmon: (w83627ehf) Display correct temperature sensor labels for systems with NCT6775F
  hwmon: (w83627ehf) Add fan debounce support for NCT6775F and NCT6776F
  hwmon: (w83627ehf) Update Kconfig for W83677HG-B, NCT6775F and NCT6776F
  hwmon: (w83627ehf) Store rpm instead of raw fan speed data
  hwmon: (w83627ehf) Use 16 bit fan count registers if supported
  hwmon: (w83627ehf) Add support for Nuvoton NCT6775F and NCT6776F
  hwmon: (w83627ehf) Permit enabling SmartFan IV mode if configured at startup
  hwmon: (w83627ehf) Convert register arrays to 16 bit, and convert access to pointers
  hwmon: (w83627ehf) Remove references to datasheets which no longer exist
  ...
parents c8def554 d668a8b0

Documentation/hwmon/f71882fg

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

    Addresses scanned: none, address read from Super I/O config space

    Datasheet: Available from the Fintek website

  * Fintek F71869F and F71869E

    Prefix: 'f71869'

    Addresses scanned: none, address read from Super I/O config space

    Datasheet: Available from the Fintek website

  * Fintek F71882FG and F71883FG

    Prefix: 'f71882fg'

    Addresses scanned: none, address read from Super I/O config space
@@ -17,6 +21,10 @@ Supported chips: 
  * Fintek F71889FG

    Prefix: 'f71889fg'

    Addresses scanned: none, address read from Super I/O config space

    Datasheet: Available from the Fintek website

  * Fintek F71889ED

    Prefix: 'f71889ed'

    Addresses scanned: none, address read from Super I/O config space

    Datasheet: Should become available on the Fintek website soon

  * Fintek F8000

    Prefix: 'f8000'
@@ -29,9 +37,9 @@ Author: Hans de Goede <hdegoede@redhat.com> 
Description

-----------



Fintek F718xxFG/F8000 Super I/O chips include complete hardware monitoring

capabilities. They can monitor up to 9 voltages (3 for the F8000), 4 fans and

3 temperature sensors.

Fintek F718xx/F8000 Super I/O chips include complete hardware monitoring

capabilities. They can monitor up to 9 voltages, 4 fans and 3 temperature

sensors.



These chips also have fan controlling features, using either DC or PWM, in

three different modes (one manual, two automatic).
@@ -99,5 +107,5 @@ Writing an unsupported mode will result in an invalid parameter error. 
  The fan speed is regulated to keep the temp the fan is mapped to between

  temp#_auto_point2_temp and temp#_auto_point3_temp.



Both of the automatic modes require that pwm1 corresponds to fan1, pwm2 to

All of the automatic modes require that pwm1 corresponds to fan1, pwm2 to

fan2 and pwm3 to fan3.

Documentation/hwmon/lineage-pem

0 → 100644
+77 −0
Original line number Diff line number Diff line 
Kernel driver lineage-pem

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



Supported devices:

  * Lineage Compact Power Line Power Entry Modules

    Prefix: 'lineage-pem'

    Addresses scanned: -

    Documentation:

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



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





Description

-----------



This driver supports various Lineage Compact Power Line DC/DC and AC/DC

converters such as CP1800, CP2000AC, CP2000DC, CP2100DC, and others.



Lineage CPL power entry modules are nominally PMBus compliant. However, most

standard PMBus commands are not supported. Specifically, all hardware monitoring

and status reporting commands are non-standard. For this reason, a standard

PMBus driver can not be used.





Usage Notes

-----------



This driver does not probe for Lineage CPL devices, since there is no register

which can be safely used to identify the chip. You will have to instantiate

the devices explicitly.



Example: the following will load the driver for a Lineage PEM at address 0x40

on I2C bus #1:

$ modprobe lineage-pem

$ echo lineage-pem 0x40 > /sys/bus/i2c/devices/i2c-1/new_device



All Lineage CPL power entry modules have a built-in I2C bus master selector

(PCA9541). To ensure device access, this driver should only be used as client

driver to the pca9541 I2C master selector driver.





Sysfs entries

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



All Lineage CPL devices report output voltage and device temperature as well as

alarms for output voltage, temperature, input voltage, input current, input power,

and fan status.



Input voltage, input current, input power, and fan speed measurement is only

supported on newer devices. The driver detects if those attributes are supported,

and only creates respective sysfs entries if they are.



in1_input		Output voltage (mV)

in1_min_alarm		Output undervoltage alarm

in1_max_alarm		Output overvoltage alarm

in1_crit		Output voltage critical alarm



in2_input		Input voltage (mV, optional)

in2_alarm		Input voltage alarm



curr1_input		Input current (mA, optional)

curr1_alarm		Input overcurrent alarm



power1_input		Input power (uW, optional)

power1_alarm		Input power alarm



fan1_input		Fan 1 speed (rpm, optional)

fan2_input		Fan 2 speed (rpm, optional)

fan3_input		Fan 3 speed (rpm, optional)



temp1_input

temp1_max

temp1_crit

temp1_alarm

temp1_crit_alarm

temp1_fault

Documentation/hwmon/lm85

+11 −1
Original line number Diff line number Diff line
@@ -26,6 +26,14 @@ Supported chips: 
    Prefix: 'emc6d102'

    Addresses scanned: I2C 0x2c, 0x2d, 0x2e

    Datasheet: http://www.smsc.com/main/catalog/emc6d102.html

  * SMSC EMC6D103

    Prefix: 'emc6d103'

    Addresses scanned: I2C 0x2c, 0x2d, 0x2e

    Datasheet: http://www.smsc.com/main/catalog/emc6d103.html

  * SMSC EMC6D103S

    Prefix: 'emc6d103s'

    Addresses scanned: I2C 0x2c, 0x2d, 0x2e

    Datasheet: http://www.smsc.com/main/catalog/emc6d103s.html



Authors:

        Philip Pokorny <ppokorny@penguincomputing.com>,
@@ -122,9 +130,11 @@ to be register compatible. The EMC6D100 offers all the features of the 
EMC6D101 plus additional voltage monitoring and system control features.

Unfortunately it is not possible to distinguish between the package

versions on register level so these additional voltage inputs may read

zero. The EMC6D102 features addtional ADC bits thus extending precision

zero. EMC6D102 and EMC6D103 feature additional ADC bits thus extending precision

of voltage and temperature channels.



SMSC EMC6D103S is similar to EMC6D103, but does not support pwm#_auto_pwm_minctl

and temp#_auto_temp_off.



Hardware Configurations

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

Documentation/hwmon/ltc4151

0 → 100644
+47 −0
Original line number Diff line number Diff line 
Kernel driver ltc4151

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



Supported chips:

  * Linear Technology LTC4151

    Prefix: 'ltc4151'

    Addresses scanned: -

    Datasheet:

        http://www.linear.com/docs/Datasheet/4151fc.pdf



Author: Per Dalen <per.dalen@appeartv.com>





Description

-----------



The LTC4151 is a High Voltage I2C Current and Voltage Monitor.





Usage Notes

-----------



This driver does not probe for LTC4151 devices, since there is no register

which can be safely used to identify the chip. You will have to instantiate

the devices explicitly.



Example: the following will load the driver for an LTC4151 at address 0x6f

on I2C bus #0:

# modprobe ltc4151

# echo ltc4151 0x6f > /sys/bus/i2c/devices/i2c-0/new_device





Sysfs entries

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



Voltage readings provided by this driver are reported as obtained from the ADIN

and VIN registers.



Current reading provided by this driver is reported as obtained from the Current

Sense register. The reported value assumes that a 1 mOhm sense resistor is

installed.



in1_input		VDIN voltage (mV)



in2_input		ADIN voltage (mV)



curr1_input		SENSE current (mA)

Documentation/hwmon/max6639

0 → 100644
+49 −0
Original line number Diff line number Diff line 
Kernel driver max6639

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



Supported chips:

  * Maxim MAX6639

    Prefix: 'max6639'

    Addresses scanned: I2C 0x2c, 0x2e, 0x2f

    Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6639.pdf



Authors:

    He Changqing <hechangqing@semptian.com>

    Roland Stigge <stigge@antcom.de>



Description

-----------



This driver implements support for the Maxim MAX6639. This chip is a 2-channel

temperature monitor with dual PWM fan speed controller. It can monitor its own

temperature and one external diode-connected transistor or two external

diode-connected transistors.



The following device attributes are implemented via sysfs:



Attribute              R/W  Contents

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

temp1_input            R    Temperature channel 1 input (0..150 C)

temp2_input            R    Temperature channel 2 input (0..150 C)

temp1_fault            R    Temperature channel 1 diode fault

temp2_fault            R    Temperature channel 2 diode fault

temp1_max              RW   Set THERM temperature for input 1

                            (in C, see datasheet)

temp2_max              RW   Set THERM temperature for input 2

temp1_crit             RW   Set ALERT temperature for input 1

temp2_crit             RW   Set ALERT temperature for input 2

temp1_emergency        RW   Set OT temperature for input 1

                            (in C, see datasheet)

temp2_emergency        RW   Set OT temperature for input 2

pwm1                   RW   Fan 1 target duty cycle (0..255)

pwm2                   RW   Fan 2 target duty cycle (0..255)

fan1_input             R    TACH1 fan tachometer input (in RPM)

fan2_input             R    TACH2 fan tachometer input (in RPM)

fan1_fault             R    Fan 1 fault

fan2_fault             R    Fan 2 fault

temp1_max_alarm        R    Alarm on THERM temperature on channel 1

temp2_max_alarm        R    Alarm on THERM temperature on channel 2

temp1_crit_alarm       R    Alarm on ALERT temperature on channel 1

temp2_crit_alarm       R    Alarm on ALERT temperature on channel 2

temp1_emergency_alarm  R    Alarm on OT temperature on channel 1

temp2_emergency_alarm  R    Alarm on OT temperature on channel 2

CRA Git | Maintained and supported by SUSTech CRA and CCSE