thermal: exynos: remove TMU_SUPPORT_EMULATION flag

Replace TMU_SUPPORT_EMULATION flag check in exynos_tmu_set_emulation()
by an explicit check for a SoC type (all SoC types except Exynos4210
have TMU_SUPPORT_EMULATION flag set in their struct exynos_tmu_init_data
instances).

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 209221f1fab25f768a2ca154cd59133238fbeb41..51d8cc70b6d66df727de77eb263ee66204f191c4 100644 (file)
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -476,7 +476,7 @@ static int exynos_tmu_set_emulation(void *drv_data, unsigned long temp)
        struct exynos_tmu_platform_data *pdata = data->pdata;
        int ret = -EINVAL;
 
-       if (!TMU_SUPPORTS(pdata, EMULATION))
+       if (data->soc == SOC_ARCH_EXYNOS4210)
                goto out;
 
        if (temp && temp < MCELSIUS)

diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
index d90852a0b40345c0b8d8ff1ab2835d7757acd95c..5ad3f3fbc6f0d64825e6ad2be774b0e4ed089cba 100644 (file)
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -47,17 +47,14 @@ enum soc_type {
 
 /**
  * EXYNOS TMU supported features.
- * TMU_SUPPORT_EMULATION - This features is used to set user defined
- *                     temperature to the TMU controller.
  * TMU_SUPPORT_MULTI_INST - This features denotes that the soc
  *                     has many instances of TMU.
  * TMU_SUPPORT_ADDRESS_MULTIPLE - This feature tells that the different TMU
  *                     sensors shares some common registers.
  * TMU_SUPPORT - macro to compare the above features with the supplied.
  */
-#define TMU_SUPPORT_EMULATION                  BIT(0)
-#define TMU_SUPPORT_MULTI_INST                 BIT(1)
-#define TMU_SUPPORT_ADDRESS_MULTIPLE           BIT(2)
+#define TMU_SUPPORT_MULTI_INST                 BIT(0)
+#define TMU_SUPPORT_ADDRESS_MULTIPLE           BIT(1)
 
 #define TMU_SUPPORTS(a, b)     (a->features & TMU_SUPPORT_ ## b)
 

diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
index 82f1cba2dc7fa35aa83fe8438cde7b39c3869277..4dd8d1c1b822594df8488a133d0f0532b63690d5 100644 (file)
--- a/drivers/thermal/samsung/exynos_tmu_data.c
+++ b/drivers/thermal/samsung/exynos_tmu_data.c
@@ -100,8 +100,7 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
                .freq_clip_max = 400 * 1000, \
                .temp_level = 95, \
        }, \
-       .freq_tab_count = 2, \
-       .features = TMU_SUPPORT_EMULATION
+       .freq_tab_count = 2
 #endif
 
 #if defined(CONFIG_SOC_EXYNOS3250)
@@ -152,8 +151,7 @@ struct exynos_tmu_init_data const exynos3250_default_tmu_data = {
                .freq_clip_max = 400 * 1000, \
                .temp_level = 95, \
        }, \
-       .freq_tab_count = 2, \
-       .features = TMU_SUPPORT_EMULATION
+       .freq_tab_count = 2
 #endif
 
 #if defined(CONFIG_SOC_EXYNOS4412)
@@ -220,8 +218,7 @@ struct exynos_tmu_init_data const exynos5250_default_tmu_data = {
 
 #define EXYNOS5260_TMU_DATA \
        __EXYNOS5260_TMU_DATA \
-       .type = SOC_ARCH_EXYNOS5260, \
-       .features = TMU_SUPPORT_EMULATION
+       .type = SOC_ARCH_EXYNOS5260
 
 struct exynos_tmu_init_data const exynos5260_default_tmu_data = {
        .tmu_data = {
@@ -274,13 +271,12 @@ struct exynos_tmu_init_data const exynos5260_default_tmu_data = {
 
 #define EXYNOS5420_TMU_DATA \
        __EXYNOS5420_TMU_DATA \
-       .type = SOC_ARCH_EXYNOS5420, \
-       .features = TMU_SUPPORT_EMULATION
+       .type = SOC_ARCH_EXYNOS5420
 
 #define EXYNOS5420_TMU_DATA_SHARED \
        __EXYNOS5420_TMU_DATA \
        .type = SOC_ARCH_EXYNOS5420_TRIMINFO, \
-       .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_ADDRESS_MULTIPLE)
+       .features = TMU_SUPPORT_ADDRESS_MULTIPLE
 
 struct exynos_tmu_init_data const exynos5420_default_tmu_data = {
        .tmu_data = {
@@ -314,8 +310,7 @@ struct exynos_tmu_init_data const exynos5420_default_tmu_data = {
        .second_point_trim = 70, \
        .default_temp_offset = 25, \
        .type = SOC_ARCH_EXYNOS5440, \
-       .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_MULTI_INST | \
-                       TMU_SUPPORT_ADDRESS_MULTIPLE),
+       .features = (TMU_SUPPORT_MULTI_INST | TMU_SUPPORT_ADDRESS_MULTIPLE),
 
 struct exynos_tmu_init_data const exynos5440_default_tmu_data = {
        .tmu_data = {