summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/thermal
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-08-27 16:07:58 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-08-27 16:07:58 +0300
commit3bf1b1571224e713f1a186de21b2204c06f1cb5e (patch)
tree965b0d67f631d3a33ef3b75bf08b7d16782ccbcf /Documentation/devicetree/bindings/thermal
parent7931e28098a4c1a2a6802510b0cbe57546d2049d (diff)
parentd92e600f860ba98eac576a976c275106af575c82 (diff)
downloadlinux-3bf1b1571224e713f1a186de21b2204c06f1cb5e.tar.xz
Merge branch 'thermal-core'
Merge thermal control core fixes for 6.0-rc3: - Fix missing required property for thermal zone description (Daniel Lezcano). - Add missing export symbol for thermal_zone_device_register_with_trips() (Daniel Lezcano). * thermal-core: dt-bindings: thermal: Fix missing required property thermal/core: Add missing EXPORT_SYMBOL_GPL
Diffstat (limited to 'Documentation/devicetree/bindings/thermal')
-rw-r--r--Documentation/devicetree/bindings/thermal/thermal-zones.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
index 2d34f3ccb257..8d2c6d74b605 100644
--- a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
+++ b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
@@ -214,6 +214,7 @@ patternProperties:
- polling-delay
- polling-delay-passive
- thermal-sensors
+ - trips
additionalProperties: false