diff options
| author | Siddartha Mohanadoss <smohanad@codeaurora.org> | 2016-07-27 11:15:20 -0700 |
|---|---|---|
| committer | Siddartha Mohanadoss <smohanad@codeaurora.org> | 2016-07-27 14:46:34 -0700 |
| commit | 727563f0d8875c0e61d104e8bf626da6e340c8f0 (patch) | |
| tree | 9f10a23db2f96cb60af641ed56c38eb9ad91ed3e | |
| parent | 8c5c49fdb240349632bcb0d3379c0f19562573a1 (diff) | |
thermal: tsens: Remove registering for Critical trip zone
The handle_critical_trips() api in thermal_core gets
invoked during the system resume path on 4.4 kernel.
If a thermal driver has registered for the critical trip
zone the handle_critical_trips() reads the current temperature
and checks against the critical threshold. If the
temperature value is greater than the critical threshold
the device is shutdown.
Remove registering the critical trip zone since its not
used by thermal sys clients. The driver will continue
to use it internally to set thresholds and monitor
the state of the TSENS (temperature sensor) controller.
Change-Id: Ie2024498224f078de77dd006d77cdfa99bb90eee
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
| -rw-r--r-- | drivers/thermal/msm-tsens.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/thermal/msm-tsens.c b/drivers/thermal/msm-tsens.c index 9e2ba25ce1ac..73d7435d2eb8 100644 --- a/drivers/thermal/msm-tsens.c +++ b/drivers/thermal/msm-tsens.c @@ -759,9 +759,9 @@ enum tsens_trip_type { }; enum tsens_tm_trip_type { - TSENS_TM_TRIP_CRITICAL = 0, - TSENS_TM_TRIP_WARM, + TSENS_TM_TRIP_WARM = 0, TSENS_TM_TRIP_COOL, + TSENS_TM_TRIP_CRITICAL, TSENS_TM_TRIP_NUM, }; @@ -1575,9 +1575,6 @@ static int tsens_tm_get_trip_type(struct thermal_zone_device *thermal, case TSENS_TM_TRIP_COOL: *type = THERMAL_TRIP_CONFIGURABLE_LOW; break; - case TSENS_TM_TRIP_CRITICAL: - *type = THERMAL_TRIP_CRITICAL; - break; default: return -EINVAL; } @@ -5717,8 +5714,8 @@ static int tsens_thermal_zone_register(struct tsens_tm_device *tmdev) tmdev->sensor[i].tm = tmdev; if (tmdev->tsens_type == TSENS_TYPE3) { tmdev->sensor[i].tz_dev = thermal_zone_device_register( - name, TSENS_TM_TRIP_NUM, - TSENS_TM_WRITABLE_TRIPS_MASK, + name, TSENS_TRIP_NUM, + TSENS_WRITABLE_TRIPS_MASK, &tmdev->sensor[i], &tsens_tm_thermal_zone_ops, NULL, 0, 0); if (IS_ERR(tmdev->sensor[i].tz_dev)) { |