diff options
| author | Tushar Behera | 2014-04-14 07:38:15 +0200 |
|---|---|---|
| committer | Zhang Rui | 2014-05-15 10:44:16 +0200 |
| commit | c65d34735a2a31d3b015804706037f8cb0726950 (patch) | |
| tree | e788ac235c084abca31e9b3e4be5d640c1124b7e /drivers/thermal | |
| parent | Thermal/int3403: Fix thermal hysteresis unit conversion (diff) | |
| download | kernel-qcow2-linux-c65d34735a2a31d3b015804706037f8cb0726950.tar.gz kernel-qcow2-linux-c65d34735a2a31d3b015804706037f8cb0726950.tar.xz kernel-qcow2-linux-c65d34735a2a31d3b015804706037f8cb0726950.zip | |
thermal: samsung: Only update available threshold limits
Currently the threshold limits are updated in 2 stages, once for all
software trigger levels and again for hardware trip point.
While updating the software trigger levels, it overwrites the threshold
limit for hardware trip point thereby forcing the Exynos core to issue
an emergency shutdown.
Updating only the required fields in threshold register fixes this issue.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Acked-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/samsung/exynos_tmu.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index 0d96a510389f..ffccc894f0f8 100644 --- a/drivers/thermal/samsung/exynos_tmu.c +++ b/drivers/thermal/samsung/exynos_tmu.c @@ -225,6 +225,8 @@ skip_calib_data: trigger_levs++; } + rising_threshold = readl(data->base + reg->threshold_th0); + if (data->soc == SOC_ARCH_EXYNOS4210) { /* Write temperature code for threshold */ threshold_code = temp_to_code(data, pdata->threshold); @@ -249,6 +251,7 @@ skip_calib_data: ret = threshold_code; goto out; } + rising_threshold &= ~(0xff << 8 * i); rising_threshold |= threshold_code << 8 * i; if (pdata->threshold_falling) { threshold_code = temp_to_code(data, @@ -281,6 +284,7 @@ skip_calib_data: } if (i == EXYNOS_MAX_TRIGGER_PER_REG - 1) { /* 1-4 level to be assigned in th0 reg */ + rising_threshold &= ~(0xff << 8 * i); rising_threshold |= threshold_code << 8 * i; writel(rising_threshold, data->base + reg->threshold_th0); |