thermal: exynos: use sanitize_temp_error() in exynos7_tmu_initialize()
authorBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Thu, 26 Apr 2018 11:51:20 +0000 (13:51 +0200)
committerEduardo Valentin <edubezval@gmail.com>
Sun, 6 May 2018 23:16:50 +0000 (16:16 -0700)
Fix sanitize_temp_error() to handle Exynos7 SoCs and then use it in
exynos7_tmu_initialize().

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
drivers/thermal/samsung/exynos_tmu.c

index 3b41666b2f13a84d4105027d65e43d84b32bdd39..5a648794b667a294bb001677e3e8a0dba8bad921 100644 (file)
@@ -286,7 +286,11 @@ static int code_to_temp(struct exynos_tmu_data *data, u16 temp_code)
 
 static void sanitize_temp_error(struct exynos_tmu_data *data, u32 trim_info)
 {
-       data->temp_error1 = trim_info & EXYNOS_TMU_TEMP_MASK;
+       u16 tmu_temp_mask =
+               (data->soc == SOC_ARCH_EXYNOS7) ? EXYNOS7_TMU_TEMP_MASK
+                                               : EXYNOS_TMU_TEMP_MASK;
+
+       data->temp_error1 = trim_info & tmu_temp_mask;
        data->temp_error2 = ((trim_info >> EXYNOS_TRIMINFO_85_SHIFT) &
                                EXYNOS_TMU_TEMP_MASK);
 
@@ -592,12 +596,7 @@ static int exynos7_tmu_initialize(struct platform_device *pdev)
        unsigned int reg_off, bit_off;
 
        trim_info = readl(data->base + EXYNOS_TMU_REG_TRIMINFO);
-
-       data->temp_error1 = trim_info & EXYNOS7_TMU_TEMP_MASK;
-       if (!data->temp_error1 ||
-           (data->min_efuse_value > data->temp_error1) ||
-           (data->temp_error1 > data->max_efuse_value))
-               data->temp_error1 = data->efuse_value & EXYNOS_TMU_TEMP_MASK;
+       sanitize_temp_error(data, trim_info);
 
        /* Write temperature code for rising and falling threshold */
        for (i = (of_thermal_get_ntrips(tz) - 1); i >= 0; i--) {