Skip to content

Commit

Permalink
thermal: of: Set THERMAL_TRIP_FLAG_RW_TEMP directly
Browse files Browse the repository at this point in the history
It is now possible to flag trip points with THERMAL_TRIP_FLAG_RW_TEMP
to allow their temperature to be set from user space via sysfs instead
of using a nonzero writable trips mask during thermal zone registration,
so make the OF thermal code do that.

No intentional functional impact.

Note that this change is requisite for dropping the mask argument from
thermal_zone_device_register_with_trips() going forward.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  • Loading branch information
Rafael J. Wysocki committed Feb 27, 2024
1 parent 68e9c60 commit 83c2d44
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/thermal/thermal_of.c
Original file line number Diff line number Diff line change
@@ -117,6 +117,8 @@ static int thermal_of_populate_trip(struct device_node *np,
return ret;
}

trip->flags = THERMAL_TRIP_FLAG_RW_TEMP;

return 0;
}

@@ -472,7 +474,7 @@ static struct thermal_zone_device *thermal_of_zone_register(struct device_node *
struct device_node *np;
const char *action;
int delay, pdelay;
int ntrips, mask;
int ntrips;
int ret;

np = of_thermal_zone_find(sensor, id);
@@ -499,15 +501,13 @@ static struct thermal_zone_device *thermal_of_zone_register(struct device_node *
of_ops.bind = thermal_of_bind;
of_ops.unbind = thermal_of_unbind;

mask = GENMASK_ULL((ntrips) - 1, 0);

ret = of_property_read_string(np, "critical-action", &action);
if (!ret)
if (!of_ops.critical && !strcasecmp(action, "reboot"))
of_ops.critical = thermal_zone_device_critical_reboot;

tz = thermal_zone_device_register_with_trips(np->name, trips, ntrips,
mask, data, &of_ops, &tzp,
0, data, &of_ops, &tzp,
pdelay, delay);
if (IS_ERR(tz)) {
ret = PTR_ERR(tz);

0 comments on commit 83c2d44

Please sign in to comment.