diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-08-27 15:07:58 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-08-27 15:07:58 +0200 |
| commit | 3bf1b1571224e713f1a186de21b2204c06f1cb5e (patch) | |
| tree | 965b0d67f631d3a33ef3b75bf08b7d16782ccbcf | |
| parent | 7931e28098a4c1a2a6802510b0cbe57546d2049d (diff) | |
| parent | d92e600f860ba98eac576a976c275106af575c82 (diff) | |
Merge branch 'thermal-core'thermal-6.0-rc3
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
| -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, |