diff options
| author | Siddartha Mohanadoss <smohanad@codeaurora.org> | 2016-02-18 13:32:52 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-22 11:10:50 -0700 |
| commit | 784e256994736a4f417f715b8a1db16eb0ff9989 (patch) | |
| tree | 1801374b4314bb3133774b16240544797bd11b4e /drivers/thermal | |
| parent | e4ddf53067d44e58aca72897fc4354481208fcde (diff) | |
thermal: qpnp-adc-tm: Enable VADC_TM
This snapshot is taken as of msm-3.18 commit dbdb6776f
(Merge "msm: camera: Add dummy sub module in sensor pipeline")
Fixup compilation to support int type for temperature
value as part of thermal ops API upgrade.
Signed-off-by: Siddartha Mohanadoss <smohanad@codeaurora.org>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/qpnp-adc-tm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/thermal/qpnp-adc-tm.c b/drivers/thermal/qpnp-adc-tm.c index 53bc0b28f19a..70ac9691f5fa 100644 --- a/drivers/thermal/qpnp-adc-tm.c +++ b/drivers/thermal/qpnp-adc-tm.c @@ -1259,7 +1259,7 @@ static int qpnp_adc_tm_get_trip_type(struct thermal_zone_device *thermal, } static int qpnp_adc_tm_get_trip_temp(struct thermal_zone_device *thermal, - int trip, unsigned long *temp) + int trip, int *temp) { struct qpnp_adc_tm_sensor *adc_tm_sensor = thermal->devdata; struct qpnp_adc_tm_chip *chip = adc_tm_sensor->chip; @@ -1338,7 +1338,7 @@ static int qpnp_adc_tm_get_trip_temp(struct thermal_zone_device *thermal, } static int qpnp_adc_tm_set_trip_temp(struct thermal_zone_device *thermal, - int trip, unsigned long temp) + int trip, int temp) { struct qpnp_adc_tm_sensor *adc_tm = thermal->devdata; struct qpnp_adc_tm_chip *chip = adc_tm->chip; @@ -1356,6 +1356,7 @@ static int qpnp_adc_tm_set_trip_temp(struct thermal_zone_device *thermal, return -EINVAL; tm_config.channel = adc_tm->vadc_channel_num; + tm_config.high_thr_temp = tm_config.low_thr_temp = 0; switch (trip) { case ADC_TM_TRIP_HIGH_WARM: tm_config.high_thr_temp = temp; @@ -2077,7 +2078,7 @@ static irqreturn_t qpnp_adc_tm_low_thr_isr(int irq, void *data) } static int qpnp_adc_read_temp(struct thermal_zone_device *thermal, - unsigned long *temp) + int *temp) { struct qpnp_adc_tm_sensor *adc_tm_sensor = thermal->devdata; struct qpnp_adc_tm_chip *chip = adc_tm_sensor->chip; |