aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid HERNANDEZ SANCHEZ <david.hernandezsanchez@st.com>2018-12-06 08:23:32 -0500
committerEduardo Valentin <edubezval@gmail.com>2018-12-10 23:15:28 -0500
commit99c47fcd4daa2b9a1348872ba49226dcdc58cb40 (patch)
treed59ad886e8fbfc354fd9dfedbf9bea5b160c5b42
parent3c9d082064b5ec5876f7e20bc50959d1915c5ab0 (diff)
thermal: stm32: Fix stm_thermal_read_factory_settings
Adding brackets allows to multiply the register value, masked by TS1_RAMP_COEFF_MASK, by an ADJUST value properly and not to multiply ADJUST by register value and then mask the whole. Fixes: 1d693155 ("thermal: add stm32 thermal driver") Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org> Signed-off-by: David Hernandez Sanchez <david.hernandezsanchez@st.com> Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
-rw-r--r--drivers/thermal/st/stm_thermal.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c
index daa1257809a6..bbd73c5a4a4e 100644
--- a/drivers/thermal/st/stm_thermal.c
+++ b/drivers/thermal/st/stm_thermal.c
@@ -241,8 +241,8 @@ static int stm_thermal_read_factory_settings(struct stm_thermal_sensor *sensor)
241 sensor->t0 = TS1_T0_VAL1; 241 sensor->t0 = TS1_T0_VAL1;
242 242
243 /* Retrieve fmt0 and put it on Hz */ 243 /* Retrieve fmt0 and put it on Hz */
244 sensor->fmt0 = ADJUST * readl_relaxed(sensor->base + DTS_T0VALR1_OFFSET) 244 sensor->fmt0 = ADJUST * (readl_relaxed(sensor->base +
245 & TS1_FMT0_MASK; 245 DTS_T0VALR1_OFFSET) & TS1_FMT0_MASK);
246 246
247 /* Retrieve ramp coefficient */ 247 /* Retrieve ramp coefficient */
248 sensor->ramp_coeff = readl_relaxed(sensor->base + DTS_RAMPVALR_OFFSET) & 248 sensor->ramp_coeff = readl_relaxed(sensor->base + DTS_RAMPVALR_OFFSET) &