diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-08-20 14:49:17 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-08-20 14:49:17 +0300 |
| commit | d92e600f860ba98eac576a976c275106af575c82 (patch) | |
| tree | 6885b8adb18e693886270a550fe7cb3087e0bcd5 | |
| parent | 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff) | |
| parent | 8c596324232d22e19f8df59ba03410b9b5b0f3d7 (diff) | |
| download | linux-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
| -rw-r--r-- | Documentation/devicetree/bindings/thermal/thermal-zones.yaml | 1 | ||||
| -rw-r--r-- | drivers/thermal/thermal_core.c | 1 |
2 files changed, 2 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 diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 6a5d0ae5d7a4..50d50cec7774 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -1329,6 +1329,7 @@ free_tz: kfree(tz); return ERR_PTR(result); } +EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips); struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask, void *devdata, struct thermal_zone_device_ops *ops, |