Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22816619 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: thermal: of-thermal: Add support for getting trip temperature"

parents ed2365b0 eb67e3af

drivers/thermal/of-thermal.c

+10 −1
Original line number Diff line number Diff line
@@ -430,7 +430,16 @@ static int of_thermal_get_trip_temp(struct thermal_zone_device *tz, int trip, 
	if (trip >= data->ntrips || trip < 0)

		return -EDOM;



	if (data->senps && data->senps->ops->get_trip_temp) {

		int ret;



		ret = data->senps->ops->get_trip_temp(data->senps->sensor_data,

						      trip, temp);

		if (ret)

			return ret;

	} else {

		*temp = data->trips[trip].temperature;

	}



	return 0;

}

include/linux/thermal.h

+3 −0
Original line number Diff line number Diff line
@@ -389,6 +389,8 @@ struct thermal_genl_event { 
 *		   temperature.

 * @set_trip_temp: a pointer to a function that sets the trip temperature on

 *		   hardware.

 * @get_trip_temp: a pointer to a function that gets the trip temperature on

 *		   hardware.

 */

struct thermal_zone_of_device_ops {

	int (*get_temp)(void *, int *);
@@ -396,6 +398,7 @@ struct thermal_zone_of_device_ops { 
	int (*set_trips)(void *, int, int);

	int (*set_emul_temp)(void *, int);

	int (*set_trip_temp)(void *, int, int);

	int (*get_trip_temp)(void *, int, int *);

};



/**