evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

thermal: exynos: remove TMU_SUPPORT_EMUL_TIME flag

Browse source 
Replace TMU_SUPPORT_EMUL_TIME flag check in get_emul_con_reg()
by an explicit check for a SoC type (all SoC types except
Exynos4210 and Exynos5440 have TMU_SUPPORT_EMUL_TIME 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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2014-11-13 16:01:21 +01:00 • committed by Eduardo Valentin
parent e0761533a1
commit d564b55a81
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/thermal/samsung/exynos_tmu.c
View file

@ -427,12 +427,10 @@ static int exynos_tmu_read(struct exynos_tmu_data *data)
static u32 get_emul_con_reg(struct exynos_tmu_data *data, unsigned int val, static u32 get_emul_con_reg(struct exynos_tmu_data *data, unsigned int val,
unsigned long temp) unsigned long temp)
{ {
struct exynos_tmu_platform_data *pdata = data->pdata;
if (temp) { if (temp) {
temp /= MCELSIUS; temp /= MCELSIUS;
if (TMU_SUPPORTS(pdata, EMUL_TIME)) { if (data->soc != SOC_ARCH_EXYNOS5440) {
val &= ~(EXYNOS_EMUL_TIME_MASK << EXYNOS_EMUL_TIME_SHIFT); val &= ~(EXYNOS_EMUL_TIME_MASK << EXYNOS_EMUL_TIME_SHIFT);
val |= (EXYNOS_EMUL_TIME << EXYNOS_EMUL_TIME_SHIFT); val |= (EXYNOS_EMUL_TIME << EXYNOS_EMUL_TIME_SHIFT);
} }

5
drivers/thermal/samsung/exynos_tmu.h
View file

@ -51,16 +51,13 @@ enum soc_type {
* temperature to the TMU controller. * temperature to the TMU controller.
* TMU_SUPPORT_MULTI_INST - This features denotes that the soc * TMU_SUPPORT_MULTI_INST - This features denotes that the soc
* has many instances of TMU. * has many instances of TMU.
* TMU_SUPPORT_EMUL_TIME - This features allows to set next temp emulation
* sample time.
* TMU_SUPPORT_ADDRESS_MULTIPLE - This feature tells that the different TMU * TMU_SUPPORT_ADDRESS_MULTIPLE - This feature tells that the different TMU
* sensors shares some common registers. * sensors shares some common registers.
* TMU_SUPPORT - macro to compare the above features with the supplied. * TMU_SUPPORT - macro to compare the above features with the supplied.
*/ */
#define TMU_SUPPORT_EMULATION BIT(0) #define TMU_SUPPORT_EMULATION BIT(0)
#define TMU_SUPPORT_MULTI_INST BIT(1) #define TMU_SUPPORT_MULTI_INST BIT(1)
#define TMU_SUPPORT_EMUL_TIME BIT(2) #define TMU_SUPPORT_ADDRESS_MULTIPLE BIT(2)
#define TMU_SUPPORT_ADDRESS_MULTIPLE BIT(3)
#define TMU_SUPPORTS(a, b) (a->features & TMU_SUPPORT_ ## b) #define TMU_SUPPORTS(a, b) (a->features & TMU_SUPPORT_ ## b)

11
drivers/thermal/samsung/exynos_tmu_data.c
View file

@ -101,7 +101,7 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
.temp_level = 95, \ .temp_level = 95, \
}, \ }, \
.freq_tab_count = 2, \ .freq_tab_count = 2, \
.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_EMUL_TIME) .features = TMU_SUPPORT_EMULATION
#endif #endif
#if defined(CONFIG_SOC_EXYNOS3250) #if defined(CONFIG_SOC_EXYNOS3250)
@ -153,7 +153,7 @@ struct exynos_tmu_init_data const exynos3250_default_tmu_data = {
.temp_level = 95, \ .temp_level = 95, \
}, \ }, \
.freq_tab_count = 2, \ .freq_tab_count = 2, \
.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_EMUL_TIME) .features = TMU_SUPPORT_EMULATION
#endif #endif
#if defined(CONFIG_SOC_EXYNOS4412) #if defined(CONFIG_SOC_EXYNOS4412)
@ -221,7 +221,7 @@ struct exynos_tmu_init_data const exynos5250_default_tmu_data = {
#define EXYNOS5260_TMU_DATA \ #define EXYNOS5260_TMU_DATA \
__EXYNOS5260_TMU_DATA \ __EXYNOS5260_TMU_DATA \
.type = SOC_ARCH_EXYNOS5260, \ .type = SOC_ARCH_EXYNOS5260, \
.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_EMUL_TIME) .features = TMU_SUPPORT_EMULATION
struct exynos_tmu_init_data const exynos5260_default_tmu_data = { struct exynos_tmu_init_data const exynos5260_default_tmu_data = {
.tmu_data = { .tmu_data = {
@ -275,13 +275,12 @@ struct exynos_tmu_init_data const exynos5260_default_tmu_data = {
#define EXYNOS5420_TMU_DATA \ #define EXYNOS5420_TMU_DATA \
__EXYNOS5420_TMU_DATA \ __EXYNOS5420_TMU_DATA \
.type = SOC_ARCH_EXYNOS5420, \ .type = SOC_ARCH_EXYNOS5420, \
.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_EMUL_TIME) .features = TMU_SUPPORT_EMULATION
#define EXYNOS5420_TMU_DATA_SHARED \ #define EXYNOS5420_TMU_DATA_SHARED \
__EXYNOS5420_TMU_DATA \ __EXYNOS5420_TMU_DATA \
.type = SOC_ARCH_EXYNOS5420_TRIMINFO, \ .type = SOC_ARCH_EXYNOS5420_TRIMINFO, \
.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_EMUL_TIME | \ .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_ADDRESS_MULTIPLE)
TMU_SUPPORT_ADDRESS_MULTIPLE)
struct exynos_tmu_init_data const exynos5420_default_tmu_data = { struct exynos_tmu_init_data const exynos5420_default_tmu_data = {
.tmu_data = { .tmu_data = {