diff --git a/[refs] b/[refs] index 18c0f3bc1a06..bfb478d4302b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f440b0622085a130ff723bb037066c9cbfc8cd7 +refs/heads/master: 03b7f67bd1a085572539788d07c4630489108a35 diff --git a/trunk/drivers/staging/ti-soc-thermal/ti-thermal-common.c b/trunk/drivers/staging/ti-soc-thermal/ti-thermal-common.c index 231c5490d1b1..092b39d15d2e 100644 --- a/trunk/drivers/staging/ti-soc-thermal/ti-thermal-common.c +++ b/trunk/drivers/staging/ti-soc-thermal/ti-thermal-common.c @@ -215,6 +215,31 @@ static int ti_thermal_get_trip_temp(struct thermal_zone_device *thermal, return 0; } +/* Get the temperature trend callback functions for thermal zone */ +static int ti_thermal_get_trend(struct thermal_zone_device *thermal, + int trip, enum thermal_trend *trend) +{ + struct ti_thermal_data *data = thermal->devdata; + struct ti_bandgap *bgp; + int id, tr, ret = 0; + + bgp = data->bgp; + id = data->sensor_id; + + ret = ti_bandgap_get_trend(bgp, id, &tr); + if (ret) + return ret; + + if (tr > 0) + *trend = THERMAL_TREND_RAISING; + else if (tr < 0) + *trend = THERMAL_TREND_DROPPING; + else + *trend = THERMAL_TREND_STABLE; + + return 0; +} + /* Get critical temperature callback functions for thermal zone */ static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal, unsigned long *temp) @@ -225,7 +250,7 @@ static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal, static struct thermal_zone_device_ops ti_thermal_ops = { .get_temp = ti_thermal_get_temp, - /* TODO: add .get_trend */ + .get_trend = ti_thermal_get_trend, .bind = ti_thermal_bind, .unbind = ti_thermal_unbind, .get_mode = ti_thermal_get_mode,