Skip to content

Commit 9aebd32

Browse files
torvaldstorvalds
committed
Merge tag 'hwmon-for-v5.9' of git://git.kernel.org/pub/scm/linux/kernel/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 ...
2 parents 4419779 + e2f75e6 commit 9aebd32

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1257
-217
lines changed

‎Documentation/devicetree/bindings/hwmon/microchip,sparx5-temp.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/hwmon/microchip,sparx5-temp.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip Sparx5 Temperature Monitor
8+
9+
maintainers:
10+
- Lars Povlsen <[email protected]>
11+
12+
description: |
13+
Microchip Sparx5 embedded temperature monitor
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- microchip,sparx5-temp
19+
20+
reg:
21+
maxItems: 1
22+
23+
clocks:
24+
items:
25+
- description: AHB reference clock
26+
27+
'#thermal-sensor-cells':
28+
const: 0
29+
30+
required:
31+
- compatible
32+
- reg
33+
- clocks
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
tmon0: tmon@610508110 {
40+
compatible = "microchip,sparx5-temp";
41+
reg = <0x10508110 0xc>;
42+
#thermal-sensor-cells = <0>;
43+
clocks = <&ahb_clk>;
44+
};

‎Documentation/devicetree/bindings/hwmon/ti,tmp513.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ description: |
1818
consumption.
1919
2020
Datasheets:
21-
http://www.ti.com/lit/gpn/tmp513
22-
http://www.ti.com/lit/gpn/tmp512
21+
https://www.ti.com/lit/gpn/tmp513
22+
https://www.ti.com/lit/gpn/tmp512
2323
2424
2525
properties:

‎Documentation/hwmon/adc128d818.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Supported chips:
99

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

12-
Datasheet: Publicly available at the TI website http://www.ti.com/
12+
Datasheet: Publicly available at the TI website https://www.ti.com/
1313

1414
Author: Guenter Roeck
1515

‎Documentation/hwmon/adm1026.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Supported chips:
1010

1111
Datasheet: Publicly available at the Analog Devices website
1212

13-
http://www.onsemi.com/PowerSolutions/product.do?id=ADM1026
13+
https://www.onsemi.com/PowerSolutions/product.do?id=ADM1026
1414

1515
Authors:
1616
- Philip Pokorny <[email protected]> for Penguin Computing

‎Documentation/hwmon/adm1031.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Supported chips:
1010

1111
Datasheet: Publicly available at the Analog Devices website
1212

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

1515
* Analog Devices ADM1031
1616

@@ -20,7 +20,7 @@ Supported chips:
2020

2121
Datasheet: Publicly available at the Analog Devices website
2222

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

2525
Authors:
2626
- Alexandre d'Alton <[email protected]>

‎Documentation/hwmon/adm1275.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Supported chips:
4949

5050
Addresses scanned: -
5151

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

5454
Author: Guenter Roeck <[email protected]>
5555

‎Documentation/hwmon/adt7410.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Supported chips:
1111

1212
Datasheet: Publicly available at the Analog Devices website
1313

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

1717
Prefix: 'adt7420'
@@ -20,7 +20,7 @@ Supported chips:
2020

2121
Datasheet: Publicly available at the Analog Devices website
2222

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

2525
* Analog Devices ADT7310
2626

@@ -30,7 +30,7 @@ Supported chips:
3030

3131
Datasheet: Publicly available at the Analog Devices website
3232

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

3535
* Analog Devices ADT7320
3636

@@ -40,7 +40,7 @@ Supported chips:
4040

4141
Datasheet: Publicly available at the Analog Devices website
4242

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

4545
Author: Hartmut Knaack <[email protected]>
4646

‎Documentation/hwmon/corsair-cpro.rst

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
.. SPDX-License-Identifier: GPL-2.0-or-later
2+
3+
Kernel driver corsair-cpro
4+
==========================
5+
6+
Supported devices:
7+
8+
* Corsair Commander Pro
9+
* Corsair Commander Pro (1000D)
10+
11+
Author: Marius Zachmann
12+
13+
Description
14+
-----------
15+
16+
This driver implements the sysfs interface for the Corsair Commander Pro.
17+
The Corsair Commander Pro is a USB device with 6 fan connectors,
18+
4 temperature sensor connectors and 2 Corsair LED connectors.
19+
It can read the voltage levels on the SATA power connector.
20+
21+
Usage Notes
22+
-----------
23+
24+
Since it is a USB device, hotswapping is possible. The device is autodetected.
25+
26+
Sysfs entries
27+
-------------
28+
29+
======================= =====================================================================
30+
in0_input Voltage on SATA 12v
31+
in1_input Voltage on SATA 5v
32+
in2_input Voltage on SATA 3.3v
33+
temp[1-4]_input Temperature on connected temperature sensors
34+
fan[1-6]_input Connected fan rpm.
35+
fan[1-6]_label Shows fan type as detected by the device.
36+
fan[1-6]_target Sets fan speed target rpm.
37+
When reading, it reports the last value if it was set by the driver.
38+
Otherwise returns an error.
39+
pwm[1-6] Sets the fan speed. Values from 0-255. Can only be read if pwm
40+
was set directly.
41+
======================= =====================================================================

‎Documentation/hwmon/emc1403.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Supported chips:
1212
Datasheets:
1313

1414
- http://ww1.microchip.com/downloads/en/DeviceDoc/1412.pdf
15-
- http://ww1.microchip.com/downloads/en/DeviceDoc/1402.pdf
15+
- https://ww1.microchip.com/downloads/en/DeviceDoc/1402.pdf
1616

1717
* SMSC / Microchip EMC1403, EMC1404, EMC1413, EMC1414
1818

@@ -33,7 +33,7 @@ Supported chips:
3333

3434
Datasheet:
3535

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

3838
* SMSC / Microchip EMC1423, EMC1424
3939

@@ -43,7 +43,7 @@ Supported chips:
4343

4444
Datasheet:
4545

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

4848
Author:
4949
Kalhan Trisal <[email protected]

‎Documentation/hwmon/f71882fg.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ motherboard, so the driver assumes that the BIOS set the method
145145
properly.
146146

147147
Note that the lowest numbered temperature zone trip point corresponds to
148-
to the border between the highest and one but highest temperature zones, and
148+
the border between the highest and one but highest temperature zones, and
149149
vica versa. So the temperature zone trip points 1-4 (or 1-2) go from high temp
150150
to low temp! This is how things are implemented in the IC, and the driver
151151
mimics this.

0 commit comments

Comments
 (0)