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

Commit 635b6273 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: thermal: of-thermal: Add support for virtual sensor"

parents be343ccd 3ced78fc

drivers/thermal/of-thermal.c

+807 −7

File changed.

Preview size limit exceeded, changes collapsed.

drivers/thermal/thermal_core.h

+12 −8
Original line number Diff line number Diff line
@@ -117,25 +117,29 @@ of_thermal_get_trip_points(struct thermal_zone_device *tz) 
}

#endif

#if (defined(CONFIG_QTI_THERMAL) && defined(CONFIG_THERMAL_OF))

int of_thermal_aggregate_trip(struct thermal_zone_device *tz,

int of_thermal_aggregate_trip(struct device *dev,

			      struct thermal_zone_device *tz,

			      enum thermal_trip_type type,

			      int *low, int *high);

void of_thermal_handle_trip(struct thermal_zone_device *tz);

void of_thermal_handle_trip_temp(struct thermal_zone_device *tz,

void of_thermal_handle_trip(struct device *dev,

			    struct thermal_zone_device *tz);

void of_thermal_handle_trip_temp(struct device *dev,

				struct thermal_zone_device *tz,

				int trip_temp);

#else

static inline int of_thermal_aggregate_trip(struct thermal_zone_device *tz,

static inline int of_thermal_aggregate_trip(struct device *dev,

					    struct thermal_zone_device *tz,

					    enum thermal_trip_type type,

					    int *low, int *high)

{

	return -ENODEV;

}

static inline

void of_thermal_handle_trip(struct thermal_zone_device *tz)

void of_thermal_handle_trip(struct device *dev, struct thermal_zone_device *tz)

{ }

static inline

void of_thermal_handle_trip_temp(struct thermal_zone_device *tz,

					int trip_temp)

void of_thermal_handle_trip_temp(struct device *dev,

				 struct thermal_zone_device *tz, int trip_temp)

{ }

#endif