summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/thermal
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-08-20 14:49:17 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-08-20 14:49:17 +0300
commitd92e600f860ba98eac576a976c275106af575c82 (patch)
tree6885b8adb18e693886270a550fe7cb3087e0bcd5 /Documentation/devicetree/bindings/thermal
parent568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff)
parent8c596324232d22e19f8df59ba03410b9b5b0f3d7 (diff)
downloadlinux-d92e600f860ba98eac576a976c275106af575c82.tar.xz
Merge tag 'thermal-v6.0-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Pull thermal control fixes for 6.0-rc3 from Daniel Lezcano: "- Fix missing required property for thermal zone description (Daniel Lezcano) - Add missing export symbol for thermal_zone_device_register_with_trips() (Daniel Lezcano)" * tag 'thermal-v6.0-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux: 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