diff options
author | 2020-04-21 09:37:13 -0400 | |
---|---|---|
committer | 2020-04-21 09:37:13 -0400 | |
commit | 3bda03865fcaf5e30248bf4b7b37a81f6966caf9 (patch) | |
tree | 40e1edb696326bfbd028afc271e7272d87b6b506 /Documentation/devicetree/bindings/thermal/thermal.txt | |
parent | kvm: Disable objtool frame pointer checking for vmenter.S (diff) | |
parent | MAINTAINERS: add a reviewer for KVM/s390 (diff) | |
download | linux-dev-3bda03865fcaf5e30248bf4b7b37a81f6966caf9.tar.xz linux-dev-3bda03865fcaf5e30248bf4b7b37a81f6966caf9.zip |
Merge tag 'kvm-s390-master-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
KVM: s390: Fix for 5.7 and maintainer update
- Silence false positive lockdep warning
- add Claudio as reviewer
Diffstat (limited to 'Documentation/devicetree/bindings/thermal/thermal.txt')
-rw-r--r-- | Documentation/devicetree/bindings/thermal/thermal.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/thermal/thermal.txt b/Documentation/devicetree/bindings/thermal/thermal.txt index ca14ba959e0d..f78bec19ca35 100644 --- a/Documentation/devicetree/bindings/thermal/thermal.txt +++ b/Documentation/devicetree/bindings/thermal/thermal.txt @@ -142,11 +142,11 @@ Required properties: - trips: A sub-node which is a container of only trip point nodes Type: sub-node required to describe the thermal zone. +Optional property: - cooling-maps: A sub-node which is a container of only cooling device Type: sub-node map nodes, used to describe the relation between trips and cooling devices. -Optional property: - coefficients: An array of integers (one signed cell) containing Type: array coefficients to compose a linear relation between Elem size: one cell the sensors listed in the thermal-sensors property. |