Skip to content

Commit

Permalink
Merge tag 'hwmon-for-v5.9' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/git/groeck/linux-staging

Pull hwmon updates from Guenter Roeck:
 "Highlights:
   - New driver for Sparx5 SoC temperature sensot
   - New driver for Corsair Commander Pro
   - MAX20710 support added to max20730 driver

  Enhancements:
   - max6697: Allow max6581 to create tempX_offset attributes
   - gsc (Gateworks System Controller): add 16bit pre-scaled voltage mode
   - adm1275: Enable adm1278 ADM1278_TEMP1_EN
   - dell-smm: Add Latitude 5480 to fan control whitelist

  Fixes:
   - adc128d818: Fix advanced configuration register init
   - pmbus/core: Use s64 instead of long for calculations to fix
     overflow issues with 32-bit architectures

  Plus various cleanups in several drivers"

* tag 'hwmon-for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (32 commits)
  hwmon: (adc128d818) Fix advanced configuration register init
  hwmon: (axi-fan-control) remove duplicate macros
  hwmon: (i5k_amb, vt8231) Drop uses of pci_read_config_*() return value
  hwmon: (sparx5) Make symbol 's5_temp_match' static
  hwmon: (corsair-cpro) add reading pwm values
  hwmon: sparx5: Add Sparx5 SoC temperature driver
  dt-bindings: hwmon: Add Sparx5 temperature sensor
  hwmon: (tmp401) Replace HTTP links with HTTPS ones
  hwmon: (lm95234) Replace HTTP links with HTTPS ones
  hwmon: (lm90) Replace HTTP links with HTTPS ones
  hwmon: (k8temp) Replace HTTP links with HTTPS ones
  hwmon: (jc42) Replace HTTP links with HTTPS ones
  hwmon: (ina2xx) Replace HTTP links with HTTPS ones
  hwmon: (ina209) Replace HTTP links with HTTPS ones
  hwmon: Replace HTTP links with HTTPS ones
  docs: hwmon: Replace HTTP links with HTTPS ones
  hwmon: (adm1025) Replace HTTP links with HTTPS ones
  hwmon: add Corsair Commander Pro driver
  hwmon: (max6697) Allow max6581 to create tempX_offset
  hwmon: (tmmp513) Replace HTTP links with HTTPS links
  ...
  • Loading branch information
Linus Torvalds committed Aug 5, 2020
2 parents 4419779 + e2f75e6 commit 9aebd32
Show file tree
Hide file tree
Showing 76 changed files with 1,257 additions and 217 deletions.
44 changes: 44 additions & 0 deletions Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/hwmon/microchip,sparx5-temp.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Microchip Sparx5 Temperature Monitor

maintainers:
- Lars Povlsen <lars.povlsen@microchip.com>

description: |
Microchip Sparx5 embedded temperature monitor
properties:
compatible:
enum:
- microchip,sparx5-temp

reg:
maxItems: 1

clocks:
items:
- description: AHB reference clock

'#thermal-sensor-cells':
const: 0

required:
- compatible
- reg
- clocks

additionalProperties: false

examples:
- |
tmon0: tmon@610508110 {
compatible = "microchip,sparx5-temp";
reg = <0x10508110 0xc>;
#thermal-sensor-cells = <0>;
clocks = <&ahb_clk>;
};
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/hwmon/ti,tmp513.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ description: |
consumption.
Datasheets:
http://www.ti.com/lit/gpn/tmp513
http://www.ti.com/lit/gpn/tmp512
https://www.ti.com/lit/gpn/tmp513
https://www.ti.com/lit/gpn/tmp512
properties:
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/adc128d818.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Supported chips:

Addresses scanned: I2C 0x1d, 0x1e, 0x1f, 0x2d, 0x2e, 0x2f

Datasheet: Publicly available at the TI website http://www.ti.com/
Datasheet: Publicly available at the TI website https://www.ti.com/

Author: Guenter Roeck

Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/adm1026.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Supported chips:

Datasheet: Publicly available at the Analog Devices website

http://www.onsemi.com/PowerSolutions/product.do?id=ADM1026
https://www.onsemi.com/PowerSolutions/product.do?id=ADM1026

Authors:
- Philip Pokorny <ppokorny@penguincomputing.com> for Penguin Computing
Expand Down
4 changes: 2 additions & 2 deletions Documentation/hwmon/adm1031.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Supported chips:

Datasheet: Publicly available at the Analog Devices website

http://www.analog.com/en/prod/0%2C2877%2CADM1030%2C00.html
https://www.analog.com/en/prod/0%2C2877%2CADM1030%2C00.html

* Analog Devices ADM1031

Expand All @@ -20,7 +20,7 @@ Supported chips:

Datasheet: Publicly available at the Analog Devices website

http://www.analog.com/en/prod/0%2C2877%2CADM1031%2C00.html
https://www.analog.com/en/prod/0%2C2877%2CADM1031%2C00.html

Authors:
- Alexandre d'Alton <alex@alexdalton.org>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/adm1275.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Supported chips:

Addresses scanned: -

Datasheet: http://www.analog.com/media/en/technical-documentation/data-sheets/ADM1293_1294.pdf
Datasheet: https://www.analog.com/media/en/technical-documentation/data-sheets/ADM1293_1294.pdf

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

Expand Down
8 changes: 4 additions & 4 deletions Documentation/hwmon/adt7410.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Supported chips:

Datasheet: Publicly available at the Analog Devices website

http://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf
https://www.analog.com/static/imported-files/data_sheets/ADT7410.pdf
* Analog Devices ADT7420

Prefix: 'adt7420'
Expand All @@ -20,7 +20,7 @@ Supported chips:

Datasheet: Publicly available at the Analog Devices website

http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf
https://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf

* Analog Devices ADT7310

Expand All @@ -30,7 +30,7 @@ Supported chips:

Datasheet: Publicly available at the Analog Devices website

http://www.analog.com/static/imported-files/data_sheets/ADT7310.pdf
https://www.analog.com/static/imported-files/data_sheets/ADT7310.pdf

* Analog Devices ADT7320

Expand All @@ -40,7 +40,7 @@ Supported chips:

Datasheet: Publicly available at the Analog Devices website

http://www.analog.com/static/imported-files/data_sheets/ADT7320.pdf
https://www.analog.com/static/imported-files/data_sheets/ADT7320.pdf

Author: Hartmut Knaack <knaack.h@gmx.de>

Expand Down
41 changes: 41 additions & 0 deletions Documentation/hwmon/corsair-cpro.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
.. SPDX-License-Identifier: GPL-2.0-or-later
Kernel driver corsair-cpro
==========================

Supported devices:

* Corsair Commander Pro
* Corsair Commander Pro (1000D)

Author: Marius Zachmann

Description
-----------

This driver implements the sysfs interface for the Corsair Commander Pro.
The Corsair Commander Pro is a USB device with 6 fan connectors,
4 temperature sensor connectors and 2 Corsair LED connectors.
It can read the voltage levels on the SATA power connector.

Usage Notes
-----------

Since it is a USB device, hotswapping is possible. The device is autodetected.

Sysfs entries
-------------

======================= =====================================================================
in0_input Voltage on SATA 12v
in1_input Voltage on SATA 5v
in2_input Voltage on SATA 3.3v
temp[1-4]_input Temperature on connected temperature sensors
fan[1-6]_input Connected fan rpm.
fan[1-6]_label Shows fan type as detected by the device.
fan[1-6]_target Sets fan speed target rpm.
When reading, it reports the last value if it was set by the driver.
Otherwise returns an error.
pwm[1-6] Sets the fan speed. Values from 0-255. Can only be read if pwm
was set directly.
======================= =====================================================================
6 changes: 3 additions & 3 deletions Documentation/hwmon/emc1403.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Supported chips:
Datasheets:

- http://ww1.microchip.com/downloads/en/DeviceDoc/1412.pdf
- http://ww1.microchip.com/downloads/en/DeviceDoc/1402.pdf
- https://ww1.microchip.com/downloads/en/DeviceDoc/1402.pdf

* SMSC / Microchip EMC1403, EMC1404, EMC1413, EMC1414

Expand All @@ -33,7 +33,7 @@ Supported chips:

Datasheet:

- http://ww1.microchip.com/downloads/en/DeviceDoc/1422.pdf
- https://ww1.microchip.com/downloads/en/DeviceDoc/1422.pdf

* SMSC / Microchip EMC1423, EMC1424

Expand All @@ -43,7 +43,7 @@ Supported chips:

Datasheet:

- http://ww1.microchip.com/downloads/en/DeviceDoc/1423_1424.pdf
- https://ww1.microchip.com/downloads/en/DeviceDoc/1423_1424.pdf

Author:
Kalhan Trisal <kalhan.trisal@intel.com
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/f71882fg.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ motherboard, so the driver assumes that the BIOS set the method
properly.

Note that the lowest numbered temperature zone trip point corresponds to
to the border between the highest and one but highest temperature zones, and
the border between the highest and one but highest temperature zones, and
vica versa. So the temperature zone trip points 1-4 (or 1-2) go from high temp
to low temp! This is how things are implemented in the IC, and the driver
mimics this.
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/ina209.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Supported chips:
Addresses scanned: -

Datasheet:
http://www.ti.com/lit/gpn/ina209
https://www.ti.com/lit/gpn/ina209

Author:
- Paul Hays <Paul.Hays@cattail.ca>
Expand Down
10 changes: 5 additions & 5 deletions Documentation/hwmon/ina2xx.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Supported chips:

Datasheet: Publicly available at the Texas Instruments website

http://www.ti.com/
https://www.ti.com/

* Texas Instruments INA220

Expand All @@ -21,7 +21,7 @@ Supported chips:

Datasheet: Publicly available at the Texas Instruments website

http://www.ti.com/
https://www.ti.com/

* Texas Instruments INA226

Expand All @@ -31,7 +31,7 @@ Supported chips:

Datasheet: Publicly available at the Texas Instruments website

http://www.ti.com/
https://www.ti.com/

* Texas Instruments INA230

Expand All @@ -41,7 +41,7 @@ Supported chips:

Datasheet: Publicly available at the Texas Instruments website

http://www.ti.com/
https://www.ti.com/

* Texas Instruments INA231

Expand All @@ -51,7 +51,7 @@ Supported chips:

Datasheet: Publicly available at the Texas Instruments website

http://www.ti.com/
https://www.ti.com/

Author: Lothar Felten <lothar.felten@gmail.com>

Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/ina3221.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Supported chips:

Datasheet: Publicly available at the Texas Instruments website

http://www.ti.com/
https://www.ti.com/

Author: Andrew F. Davis <afd@ti.com>

Expand Down
1 change: 1 addition & 0 deletions Documentation/hwmon/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ Hardware Monitoring Kernel Drivers
bel-pfe
bt1-pvt
coretemp
corsair-cpro
da9052
da9055
dell-smm-hwmon
Expand Down
26 changes: 13 additions & 13 deletions Documentation/hwmon/jc42.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Supported chips:

Datasheets:

http://www.analog.com/static/imported-files/data_sheets/ADT7408.pdf
https://www.analog.com/static/imported-files/data_sheets/ADT7408.pdf

* Atmel AT30TS00, AT30TS002A/B, AT30TSE004A

Expand Down Expand Up @@ -39,37 +39,37 @@ Supported chips:

Datasheets:

http://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf
https://ww1.microchip.com/downloads/en/DeviceDoc/22203C.pdf

http://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf
https://ww1.microchip.com/downloads/en/DeviceDoc/21977b.pdf

http://ww1.microchip.com/downloads/en/DeviceDoc/25095A.pdf
https://ww1.microchip.com/downloads/en/DeviceDoc/25095A.pdf

http://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf
https://ww1.microchip.com/downloads/en/DeviceDoc/21996a.pdf

http://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf
https://ww1.microchip.com/downloads/en/DeviceDoc/22153c.pdf

http://ww1.microchip.com/downloads/en/DeviceDoc/22327A.pdf
https://ww1.microchip.com/downloads/en/DeviceDoc/22327A.pdf

* NXP Semiconductors SE97, SE97B, SE98, SE98A

Datasheets:

http://www.nxp.com/documents/data_sheet/SE97.pdf
https://www.nxp.com/documents/data_sheet/SE97.pdf

http://www.nxp.com/documents/data_sheet/SE97B.pdf
https://www.nxp.com/documents/data_sheet/SE97B.pdf

http://www.nxp.com/documents/data_sheet/SE98.pdf
https://www.nxp.com/documents/data_sheet/SE98.pdf

http://www.nxp.com/documents/data_sheet/SE98A.pdf
https://www.nxp.com/documents/data_sheet/SE98A.pdf

* ON Semiconductor CAT34TS02, CAT6095

Datasheet:

http://www.onsemi.com/pub_link/Collateral/CAT34TS02-D.PDF
https://www.onsemi.com/pub_link/Collateral/CAT34TS02-D.PDF

http://www.onsemi.com/pub/Collateral/CAT6095-D.PDF
https://www.onsemi.com/pub/Collateral/CAT6095-D.PDF

* ST Microelectronics STTS424, STTS424E02, STTS2002, STTS2004, STTS3000

Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/k8temp.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Supported chips:

Addresses scanned: PCI space

Datasheet: http://www.amd.com/system/files/TechDocs/32559.pdf
Datasheet: https://www.amd.com/system/files/TechDocs/32559.pdf

Author: Rudolf Marek

Expand Down
6 changes: 3 additions & 3 deletions Documentation/hwmon/lm25066.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ Supported chips:

Datasheets:

http://www.ti.com/lit/gpn/lm25056
https://www.ti.com/lit/gpn/lm25056

http://www.ti.com/lit/gpn/lm25056a
https://www.ti.com/lit/gpn/lm25056a

* National Semiconductor LM25066

Expand Down Expand Up @@ -55,7 +55,7 @@ Supported chips:

Datasheet:

http://www.ti.com/product/LM5066I
https://www.ti.com/product/LM5066I


Author: Guenter Roeck <linux@roeck-us.net>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/hwmon/lm63.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Author: Jean Delvare <jdelvare@suse.de>
Thanks go to Tyan and especially Alex Buckingham for setting up a remote
access to their S4882 test platform for this driver.

http://www.tyan.com/
https://www.tyan.com/

Description
-----------
Expand Down
Loading

0 comments on commit 9aebd32

Please sign in to comment.