Commit d92e600f authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 568035b0 8c596324

Documentation/devicetree/bindings/thermal/thermal-zones.yaml

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ patternProperties: 
      - polling-delay

      - polling-delay-passive

      - thermal-sensors

      - trips



    additionalProperties: false

drivers/thermal/thermal_core.c

+1 −0
Original line number Diff line number Diff line
@@ -1329,6 +1329,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t 
	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,