thermal: exynos: add get_th_reg() helper

Factor out code for preparing threshold register value from
exynos_tmu_initialize() into get_th_reg().

This is a preparation for introducing per-SoC type tmu_initialize
method.

There should be no functional changes caused by this patch.

Cc: Amit Daniel Kachhap <amit.daniel@samsung.com>
Cc: Lukasz Majewski <l.majewski@samsung.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>

diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index b0c07151e2ebeb50ed861eed012f6a46e1318dad..6e82fdd860b0a8ea21ae3096c23fb3dd9a91e348 100644 (file)
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -158,6 +158,25 @@ static void sanitize_temp_error(struct exynos_tmu_data *data, u32 trim_info)
                        EXYNOS_TMU_TEMP_MASK;
 }
 
+static u32 get_th_reg(struct exynos_tmu_data *data, u32 threshold, bool falling)
+{
+       struct exynos_tmu_platform_data *pdata = data->pdata;
+       int i;
+
+       for (i = 0; i < pdata->non_hw_trigger_levels; i++) {
+               u8 temp = pdata->trigger_levels[i];
+
+               if (falling)
+                       temp -= pdata->threshold_falling;
+               else
+                       threshold &= ~(0xff << 8 * i);
+
+               threshold |= temp_to_code(data, temp) << 8 * i;
+       }
+
+       return threshold;
+}
+
 static int exynos_tmu_initialize(struct platform_device *pdev)
 {
        struct exynos_tmu_data *data = platform_get_drvdata(pdev);
@@ -221,8 +240,6 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
        }
        sanitize_temp_error(data, trim_info);
 
-       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);
@@ -235,18 +252,10 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
                exynos_tmu_clear_irqs(data);
        } else {
                /* Write temperature code for rising and falling threshold */
-               for (i = 0; i < pdata->non_hw_trigger_levels; i++) {
-                       threshold_code = temp_to_code(data,
-                                               pdata->trigger_levels[i]);
-                       rising_threshold &= ~(0xff << 8 * i);
-                       rising_threshold |= threshold_code << 8 * i;
-                       if (data->soc != SOC_ARCH_EXYNOS5440) {
-                               threshold_code = temp_to_code(data,
-                                               pdata->trigger_levels[i] -
-                                               pdata->threshold_falling);
-                               falling_threshold |= threshold_code << 8 * i;
-                       }
-               }
+               rising_threshold = readl(data->base + reg->threshold_th0);
+               rising_threshold = get_th_reg(data, rising_threshold, false);
+               if (data->soc != SOC_ARCH_EXYNOS5440)
+                       falling_threshold = get_th_reg(data, 0, true);
 
                writel(rising_threshold,
                                data->base + reg->threshold_th0);