forked from torvalds/linux
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/groeck/linux-staging.git
- Loading branch information
Showing
9 changed files
with
717 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: "http://devicetree.org/schemas/hwmon/iio-hwmon.yaml#" | ||
$schema: "http://devicetree.org/meta-schemas/core.yaml#" | ||
|
||
title: ADC-attached Hardware Sensor Device Tree Bindings | ||
|
||
maintainers: | ||
- Jonathan Cameron <jic23@kernel.org> | ||
|
||
description: > | ||
Bindings for hardware monitoring devices connected to ADC controllers | ||
supporting the Industrial I/O bindings. | ||
properties: | ||
compatible: | ||
const: iio-hwmon | ||
|
||
io-channels: | ||
minItems: 1 | ||
maxItems: 8 # Should be enough | ||
description: > | ||
List of phandles to ADC channels to read the monitoring values | ||
required: | ||
- compatible | ||
- io-channels | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
iio-hwmon { | ||
compatible = "iio-hwmon"; | ||
io-channels = <&adc 1>, <&adc 2>; | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -130,6 +130,7 @@ Hardware Monitoring Kernel Drivers | |
max31785 | ||
max31790 | ||
max34440 | ||
max6620 | ||
max6639 | ||
max6642 | ||
max6650 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
.. SPDX-License-Identifier: GPL-2.0-or-later | ||
Kernel driver max6620 | ||
===================== | ||
|
||
Supported chips: | ||
|
||
Maxim MAX6620 | ||
|
||
Prefix: 'max6620' | ||
|
||
Addresses scanned: none | ||
|
||
Datasheet: http://pdfserv.maxim-ic.com/en/ds/MAX6620.pdf | ||
|
||
Authors: | ||
- L\. Grunenberg <contact@lgrunenberg.de> | ||
- Cumulus Networks <support@cumulusnetworks.com> | ||
- Shuotian Cheng <shuche@microsoft.com> | ||
- Arun Saravanan Balachandran <Arun_Saravanan_Balac@dell.com> | ||
|
||
Description | ||
----------- | ||
|
||
This driver implements support for Maxim MAX6620 fan controller. | ||
|
||
The driver configures the fan controller in RPM mode. To give the readings more | ||
range or accuracy, the desired value can be set by a programmable register | ||
(1, 2, 4, 8, 16 or 32). Set higher values for larger speeds. | ||
|
||
The driver provides the following sensor access in sysfs: | ||
|
||
================ ======= ===================================================== | ||
fan[1-4]_alarm ro Fan alarm. | ||
fan[1-4]_div rw Sets the nominal RPM range of the fan. Valid values | ||
are 1, 2, 4, 8, 16 and 32. | ||
fan[1-4]_input ro Fan speed in RPM. | ||
fan[1-4]_target rw Desired fan speed in RPM. | ||
================ ======= ===================================================== | ||
|
||
Usage notes | ||
----------- | ||
|
||
This driver does not auto-detect devices. You will have to instantiate the | ||
devices explicitly. Please see Documentation/i2c/instantiating-devices.rst for | ||
details. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.