Merge tag 'hwmon-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:
"New drivers:
- Inspur Power System power supply driver
- Synaptics AS370 PVT sensor driver
Chip support:
- support SHTC3 in shtc1 driver
- support NCT6116 in nct6775 driver
- support AMD family 17h, model 70h CPUs in k10temp driver
- support PCT2075 in lm75 driver
Removed drivers:
- ads1015 driver (now supported in iio)
Other changes:
- Convert drivers to use devm_i2c_new_dummy_device
- Substantial structural improvements in lm75 driver adding support
for writing sample interval for supported chips
- Add support for PSU version 2 to ibm-cffps driver
- Add support for power attribute to iio_hwmon bridge
- Add support for additional fan, voltage and temperature attributes
to nct7904 driver
- Convert adt7475 driver to use hwmon_device_register_with_groups()
- Convert k8temp driver to use hwmon_device_register_with_info()
- Various other improvements and minor fixes"
* tag 'hwmon-for-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (48 commits)
hwmon: submitting-patches: Add note on comment style
hwmon: submitting-patches: Point to with_info API
hwmon: (nct7904) Fix incorrect SMI status register setting of LTD temperature and fan.
hwmon: (shtc1) add support for the SHTC3 sensor
hwmon: (shtc1) fix shtc1 and shtw1 id mask
hwmon: (lm75) Aproximate sample times to data-sheet values
hwmon: (w83793d) convert to use devm_i2c_new_dummy_device
hwmon: (w83792d) convert to use devm_i2c_new_dummy_device
hwmon: (w83791d) convert to use devm_i2c_new_dummy_device
hwmon: (as370-hwmon) fix devm_platform_ioremap_resource.cocci warnings
hwmon: (lm75) Add support for writing sampling period on PCT2075
hwmon: (lm75) Add support for writing conversion time for TMP112
hwmon: (lm75) Move updating the sample interval to its own function
hwmon: (lm75) Support configuring the sample time for various chips
hwmon: (nct7904) Fix incorrect temperature limitation register setting of LTD.
hwmon: (as370-hwmon) Add DT bindings for Synaptics AS370 PVT
hwmon: Add Synaptics AS370 PVT sensor driver
pmbus: (ibm-cffps) Add support for version 2 of the PSU
dt-bindings: hwmon: Document ibm,cffps2 compatible string
hwmon: (iio_hwmon) Enable power exporting from IIO
...
このコミットが含まれているのは:
Linus Torvalds
@@ -0,0 +1,11 @@
|
||||
Bindings for Synaptics AS370 PVT sensors
|
||||
|
||||
Required properties:
|
||||
- compatible : "syna,as370-hwmon"
|
||||
- reg : address and length of the register set.
|
||||
|
||||
Example:
|
||||
hwmon@ea0810 {
|
||||
compatible = "syna,as370-hwmon";
|
||||
reg = <0xea0810 0xc>;
|
||||
};
|
||||
@@ -1,8 +1,10 @@
|
||||
Device-tree bindings for IBM Common Form Factor Power Supply Version 1
|
||||
----------------------------------------------------------------------
|
||||
Device-tree bindings for IBM Common Form Factor Power Supply Versions 1 and 2
|
||||
-----------------------------------------------------------------------------
|
||||
|
||||
Required properties:
|
||||
- compatible = "ibm,cffps1";
|
||||
- compatible : Must be one of the following:
|
||||
"ibm,cffps1"
|
||||
"ibm,cffps2"
|
||||
- reg = < I2C bus address >; : Address of the power supply on the
|
||||
I2C bus.
|
||||
|
||||
|
||||
@@ -15,6 +15,7 @@ Required properties:
|
||||
"maxim,max31725",
|
||||
"maxim,max31726",
|
||||
"maxim,mcp980x",
|
||||
"nxp,pct2075",
|
||||
"st,stds75",
|
||||
"st,stlm75",
|
||||
"microchip,tcn75",
|
||||
|
||||
@@ -104,6 +104,8 @@ properties:
|
||||
- infineon,slb9645tt
|
||||
# Infineon TLV493D-A1B6 I2C 3D Magnetic Sensor
|
||||
- infineon,tlv493d-a1b6
|
||||
# Inspur Power System power supply unit version 1
|
||||
- inspur,ipsps1
|
||||
# Intersil ISL29028 Ambient Light and Proximity Sensor
|
||||
- isil,isl29028
|
||||
# Intersil ISL29030 Ambient Light and Proximity Sensor
|
||||
|
||||
@@ -1,90 +0,0 @@
|
||||
Kernel driver ads1015
|
||||
=====================
|
||||
|
||||
Supported chips:
|
||||
|
||||
* Texas Instruments ADS1015
|
||||
|
||||
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>
|
||||
|
||||
Description
|
||||
-----------
|
||||
|
||||
This driver implements support for the Texas Instruments ADS1015/ADS1115.
|
||||
|
||||
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.
|
||||
|
||||
The inputs can be made available by 8 sysfs input files in0_input - in7_input:
|
||||
|
||||
- in0: Voltage over AIN0 and AIN1.
|
||||
- in1: Voltage over AIN0 and AIN3.
|
||||
- in2: Voltage over AIN1 and AIN3.
|
||||
- in3: Voltage over AIN2 and AIN3.
|
||||
- in4: Voltage over AIN0 and GND.
|
||||
- in5: Voltage over AIN1 and GND.
|
||||
- in6: Voltage over AIN2 and GND.
|
||||
- in7: Voltage over AIN3 and GND.
|
||||
|
||||
Which inputs are available can be configured using platform data or devicetree.
|
||||
|
||||
By default all inputs are exported.
|
||||
|
||||
Platform Data
|
||||
-------------
|
||||
|
||||
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
|
||||
- 1: +/- 4.096 V
|
||||
- 2: +/- 2.048 V
|
||||
- 3: +/- 1.024 V
|
||||
- 4: +/- 0.512 V
|
||||
- 5: +/- 0.256 V
|
||||
|
||||
- data_rate in samples per second
|
||||
|
||||
- 0: 128
|
||||
- 1: 250
|
||||
- 2: 490
|
||||
- 3: 920
|
||||
- 4: 1600
|
||||
- 5: 2400
|
||||
- 6: 3300
|
||||
|
||||
Example::
|
||||
|
||||
struct ads1015_platform_data data = {
|
||||
.channel_data = {
|
||||
[2] = { .enabled = true, .pga = 1, .data_rate = 0 },
|
||||
[4] = { .enabled = true, .pga = 4, .data_rate = 5 },
|
||||
}
|
||||
};
|
||||
|
||||
In this case only in2_input (FS +/- 4.096 V, 128 SPS) and in4_input
|
||||
(FS +/- 0.512 V, 2400 SPS) would be created.
|
||||
|
||||
Devicetree
|
||||
----------
|
||||
|
||||
Configuration is also possible via devicetree:
|
||||
Documentation/devicetree/bindings/hwmon/ads1015.txt
|
||||
@@ -30,7 +30,6 @@ Hardware Monitoring Kernel Drivers
|
||||
adm1031
|
||||
adm1275
|
||||
adm9240
|
||||
ads1015
|
||||
ads7828
|
||||
adt7410
|
||||
adt7411
|
||||
@@ -130,6 +129,7 @@ Hardware Monitoring Kernel Drivers
|
||||
pcf8591
|
||||
pmbus
|
||||
powr1220
|
||||
pxe1610
|
||||
pwm-fan
|
||||
raspberrypi-hwmon
|
||||
sch5627
|
||||
|
||||
79
Documentation/hwmon/inspur-ipsps1.rst
ノーマルファイル
79
Documentation/hwmon/inspur-ipsps1.rst
ノーマルファイル
@@ -0,0 +1,79 @@
|
||||
Kernel driver inspur-ipsps1
|
||||
=======================
|
||||
|
||||
Supported chips:
|
||||
|
||||
* Inspur Power System power supply unit
|
||||
|
||||
Author: John Wang <wangzqbj@inspur.com>
|
||||
|
||||
Description
|
||||
-----------
|
||||
|
||||
This driver supports Inspur Power System power supplies. This driver
|
||||
is a client to the core PMBus driver.
|
||||
|
||||
Usage Notes
|
||||
-----------
|
||||
|
||||
This driver does not auto-detect devices. You will have to instantiate the
|
||||
devices explicitly. Please see Documentation/i2c/instantiating-devices for
|
||||
details.
|
||||
|
||||
Sysfs entries
|
||||
-------------
|
||||
|
||||
The following attributes are supported:
|
||||
|
||||
======================= ======================================================
|
||||
curr1_input Measured input current
|
||||
curr1_label "iin"
|
||||
curr1_max Maximum current
|
||||
curr1_max_alarm Current high alarm
|
||||
curr2_input Measured output current in mA.
|
||||
curr2_label "iout1"
|
||||
curr2_crit Critical maximum current
|
||||
curr2_crit_alarm Current critical high alarm
|
||||
curr2_max Maximum current
|
||||
curr2_max_alarm Current high alarm
|
||||
|
||||
fan1_alarm Fan 1 warning.
|
||||
fan1_fault Fan 1 fault.
|
||||
fan1_input Fan 1 speed in RPM.
|
||||
|
||||
in1_alarm Input voltage under-voltage alarm.
|
||||
in1_input Measured input voltage in mV.
|
||||
in1_label "vin"
|
||||
in2_input Measured output voltage in mV.
|
||||
in2_label "vout1"
|
||||
in2_lcrit Critical minimum output voltage
|
||||
in2_lcrit_alarm Output voltage critical low alarm
|
||||
in2_max Maximum output voltage
|
||||
in2_max_alarm Output voltage high alarm
|
||||
in2_min Minimum output voltage
|
||||
in2_min_alarm Output voltage low alarm
|
||||
|
||||
power1_alarm Input fault or alarm.
|
||||
power1_input Measured input power in uW.
|
||||
power1_label "pin"
|
||||
power1_max Input power limit
|
||||
power2_max_alarm Output power high alarm
|
||||
power2_max Output power limit
|
||||
power2_input Measured output power in uW.
|
||||
power2_label "pout"
|
||||
|
||||
temp[1-3]_input Measured temperature
|
||||
temp[1-2]_max Maximum temperature
|
||||
temp[1-3]_max_alarm Temperature high alarm
|
||||
|
||||
vendor Manufacturer name
|
||||
model Product model
|
||||
part_number Product part number
|
||||
serial_number Product serial number
|
||||
fw_version Firmware version
|
||||
hw_version Hardware version
|
||||
mode Work mode. Can be set to active or
|
||||
standby, when set to standby, PSU will
|
||||
automatically switch between standby
|
||||
and redundancy mode.
|
||||
======================= ======================================================
|
||||
@@ -119,9 +119,9 @@ Supported chips:
|
||||
|
||||
http://www.ti.com/product/tmp275
|
||||
|
||||
* NXP LM75B
|
||||
* NXP LM75B, PCT2075
|
||||
|
||||
Prefix: 'lm75b'
|
||||
Prefix: 'lm75b', 'pct2075'
|
||||
|
||||
Addresses scanned: none
|
||||
|
||||
@@ -129,6 +129,8 @@ Supported chips:
|
||||
|
||||
http://www.nxp.com/documents/data_sheet/LM75B.pdf
|
||||
|
||||
http://www.nxp.com/docs/en/data-sheet/PCT2075.pdf
|
||||
|
||||
Author: Frodo Looijaard <frodol@dds.nl>
|
||||
|
||||
Description
|
||||
|
||||
@@ -2,19 +2,29 @@ Kernel driver pxe1610
|
||||
=====================
|
||||
|
||||
Supported chips:
|
||||
|
||||
* Infineon PXE1610
|
||||
|
||||
Prefix: 'pxe1610'
|
||||
|
||||
Addresses scanned: -
|
||||
|
||||
Datasheet: Datasheet is not publicly available.
|
||||
|
||||
* Infineon PXE1110
|
||||
|
||||
Prefix: 'pxe1110'
|
||||
|
||||
Addresses scanned: -
|
||||
|
||||
Datasheet: Datasheet is not publicly available.
|
||||
|
||||
* Infineon PXM1310
|
||||
|
||||
Prefix: 'pxm1310'
|
||||
|
||||
Addresses scanned: -
|
||||
|
||||
Datasheet: Datasheet is not publicly available.
|
||||
|
||||
Author: Vijay Khemka <vijaykhemka@fb.com>
|
||||
@@ -25,14 +35,19 @@ Description
|
||||
|
||||
PXE1610/PXE1110 are Multi-rail/Multiphase Digital Controllers
|
||||
and compliant to
|
||||
-- Intel VR13 DC-DC converter specifications.
|
||||
-- Intel SVID protocol.
|
||||
|
||||
- Intel VR13 DC-DC converter specifications.
|
||||
- Intel SVID protocol.
|
||||
|
||||
Used for Vcore power regulation for Intel VR13 based microprocessors
|
||||
-- Servers, Workstations, and High-end desktops
|
||||
|
||||
- Servers, Workstations, and High-end desktops
|
||||
|
||||
PXM1310 is a Multi-rail Controller and it is compliant to
|
||||
-- Intel VR13 DC-DC converter specifications.
|
||||
-- Intel SVID protocol.
|
||||
|
||||
- Intel VR13 DC-DC converter specifications.
|
||||
- Intel SVID protocol.
|
||||
|
||||
Used for DDR3/DDR4 Memory power regulation for Intel VR13 and
|
||||
IMVP8 based systems
|
||||
|
||||
@@ -44,10 +59,10 @@ 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 PXE1610
|
||||
at address 0x70 on I2C bus #4:
|
||||
at address 0x70 on I2C bus #4::
|
||||
|
||||
# modprobe pxe1610
|
||||
# echo pxe1610 0x70 > /sys/bus/i2c/devices/i2c-4/new_device
|
||||
# modprobe pxe1610
|
||||
# echo pxe1610 0x70 > /sys/bus/i2c/devices/i2c-4/new_device
|
||||
|
||||
It can also be instantiated by declaring in device tree
|
||||
|
||||
@@ -55,6 +70,7 @@ It can also be instantiated by declaring in device tree
|
||||
Sysfs attributes
|
||||
----------------
|
||||
|
||||
====================== ====================================
|
||||
curr1_label "iin"
|
||||
curr1_input Measured input current
|
||||
curr1_alarm Current high alarm
|
||||
@@ -88,3 +104,4 @@ temp[1-3]_crit Critical high temperature
|
||||
temp[1-3]_crit_alarm Chip temperature critical high alarm
|
||||
temp[1-3]_max Maximum temperature
|
||||
temp[1-3]_max_alarm Chip temperature high alarm
|
||||
====================== ====================================
|
||||
@@ -19,7 +19,17 @@ Supported chips:
|
||||
|
||||
Addresses scanned: none
|
||||
|
||||
Datasheet: Not publicly available
|
||||
Datasheet: http://www.sensirion.com/file/datasheet_shtw1
|
||||
|
||||
|
||||
|
||||
* Sensirion SHTC3
|
||||
|
||||
Prefix: 'shtc3'
|
||||
|
||||
Addresses scanned: none
|
||||
|
||||
Datasheet: http://www.sensirion.com/file/datasheet_shtc3
|
||||
|
||||
|
||||
|
||||
@@ -30,10 +40,9 @@ Author:
|
||||
Description
|
||||
-----------
|
||||
|
||||
This driver implements support for the Sensirion SHTC1 chip, a humidity and
|
||||
temperature sensor. Temperature is measured in degrees celsius, relative
|
||||
humidity is expressed as a percentage. Driver can be used as well for SHTW1
|
||||
chip, which has the same electrical interface.
|
||||
This driver implements support for the Sensirion SHTC1, SHTW1, and SHTC3
|
||||
chips, a humidity and temperature sensor. Temperature is measured in degrees
|
||||
celsius, relative humidity is expressed as a percentage.
|
||||
|
||||
The device communicates with the I2C protocol. All sensors are set to I2C
|
||||
address 0x70. See Documentation/i2c/instantiating-devices for methods to
|
||||
|
||||
@@ -20,6 +20,10 @@ increase the chances of your change being accepted.
|
||||
errors, no warnings, and few if any check messages. If there are any
|
||||
messages, please be prepared to explain.
|
||||
|
||||
* Please use the standard multi-line comment style. Do not mix C and C++
|
||||
style comments in a single driver (with the exception of the SPDX license
|
||||
identifier).
|
||||
|
||||
* If your patch generates checkpatch errors, warnings, or check messages,
|
||||
please refrain from explanations such as "I prefer that coding style".
|
||||
Keep in mind that each unnecessary message helps hiding a real problem,
|
||||
@@ -120,8 +124,8 @@ increase the chances of your change being accepted.
|
||||
completely initialize your chip and your driver first, then register with
|
||||
the hwmon subsystem.
|
||||
|
||||
* Use devm_hwmon_device_register_with_groups() or, if your driver needs a remove
|
||||
function, hwmon_device_register_with_groups() to register your driver with the
|
||||
* Use devm_hwmon_device_register_with_info() or, if your driver needs a remove
|
||||
function, hwmon_device_register_with_info() to register your driver with the
|
||||
hwmon subsystem. Try using devm_add_action() instead of a remove function if
|
||||
possible. Do not use hwmon_device_register().
|
||||
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする