diff options
| author | Bai Ping <b51503@freescale.com> | 2015-06-26 23:07:19 +0800 |
|---|---|---|
| committer | Bai Ping <b51503@freescale.com> | 2015-06-30 02:31:42 +0800 |
| commit | d6ba85e73f9fd7fa71d0e4b815c25906d10a609d (patch) | |
| tree | bd6d30d437aa387f9aca436c3d5d44e993b61c95 /drivers | |
| parent | 882ac79d77ca292c5c4256bf249da8f0afc2bce7 (diff) | |
MLK-11178-02 thermal: imx: disbale hardware reset funtion on imx7
As per to the design team, use the software poweroff when critical
trip temp reached. No need to set the panic alam register bits
when using the software poweroff as the critical trip action.
Signed-off-by: Bai Ping <b51503@freescale.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/thermal/imx_thermal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 6e2ccd1b7388..c3cb3a0b0476 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -392,7 +392,7 @@ static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip, if (trip == IMX_TRIP_CRITICAL) { data->temp_critical = temp; - if (data->socdata->version != TEMPMON_V1) + if (data->socdata->version == TEMPMON_V2) imx_set_panic_temp(data, temp); } @@ -752,8 +752,7 @@ static int imx_thermal_probe(struct platform_device *pdev) /* Enable measurements at ~ 10 Hz */ measure_freq = DIV_ROUND_UP(32768, 10); /* 10 Hz */ - if (data->socdata->version != TEMPMON_V3) - regmap_field_write(data->measure_freq, measure_freq); + regmap_field_write(data->measure_freq, measure_freq); imx_set_alarm_temp(data, data->temp_passive); if (data->socdata->version == TEMPMON_V2) |