Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-14 07:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

thermal: exynos: remove TMU_SUPPORT_READY_STATUS flag

Browse Source 
Replace TMU_SUPPORT_READY_STATUS flag check in
exynos_tmu_initialize() by an explicit check for a SoC type
(all SoC types except Exynos5440 have TMU_SUPPORT_READY_STATUS
flag set in their struct exynos_tmu_init_data instances).

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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2014-11-13 16:01:09 +01:00 committed by Eduardo Valentin
parent 23f146296c
commit 6f02fa18fb
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/thermal/samsung/exynos_tmu.c
View File

@ -153,7 +153,7 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
if (!IS_ERR(data->clk_sec)) if (!IS_ERR(data->clk_sec))
clk_enable(data->clk_sec); clk_enable(data->clk_sec);
if (TMU_SUPPORTS(pdata, READY_STATUS)) { if (data->soc != SOC_ARCH_EXYNOS5440) {
status = readb(data->base + EXYNOS_TMU_REG_STATUS); status = readb(data->base + EXYNOS_TMU_REG_STATUS);
if (!status) { if (!status) {
ret = -EBUSY; ret = -EBUSY;

7
drivers/thermal/samsung/exynos_tmu.h
View File

@ -54,8 +54,6 @@ enum soc_type {
* be reloaded. * be reloaded.
* TMU_SUPPORT_FALLING_TRIP - This features shows that interrupt can * TMU_SUPPORT_FALLING_TRIP - This features shows that interrupt can
* be registered for falling trips also. * be registered for falling trips also.
* TMU_SUPPORT_READY_STATUS - This feature tells that the TMU current
* state(active/idle) can be checked.
* TMU_SUPPORT_EMUL_TIME - This features allows to set next temp emulation * TMU_SUPPORT_EMUL_TIME - This features allows to set next temp emulation
* sample time. * sample time.
* TMU_SUPPORT_ADDRESS_MULTIPLE - This feature tells that the different TMU * TMU_SUPPORT_ADDRESS_MULTIPLE - This feature tells that the different TMU
@ -66,9 +64,8 @@ enum soc_type {
#define TMU_SUPPORT_MULTI_INST BIT(1) #define TMU_SUPPORT_MULTI_INST BIT(1)
#define TMU_SUPPORT_TRIM_RELOAD BIT(2) #define TMU_SUPPORT_TRIM_RELOAD BIT(2)
#define TMU_SUPPORT_FALLING_TRIP BIT(3) #define TMU_SUPPORT_FALLING_TRIP BIT(3)
#define TMU_SUPPORT_READY_STATUS BIT(4) #define TMU_SUPPORT_EMUL_TIME BIT(4)
#define TMU_SUPPORT_EMUL_TIME BIT(5) #define TMU_SUPPORT_ADDRESS_MULTIPLE BIT(5)
#define TMU_SUPPORT_ADDRESS_MULTIPLE BIT(6)
#define TMU_SUPPORTS(a, b) (a->features & TMU_SUPPORT_ ## b) #define TMU_SUPPORTS(a, b) (a->features & TMU_SUPPORT_ ## b)

14
drivers/thermal/samsung/exynos_tmu_data.c
View File

@ -73,7 +73,6 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
.freq_tab_count = 2, .freq_tab_count = 2,
.type = SOC_ARCH_EXYNOS4210, .type = SOC_ARCH_EXYNOS4210,
.registers = &exynos4210_tmu_registers, .registers = &exynos4210_tmu_registers,
.features = TMU_SUPPORT_READY_STATUS,
}, },
}, },
.tmu_count = 1, .tmu_count = 1,
@ -133,8 +132,7 @@ static const struct exynos_tmu_registers exynos3250_tmu_registers = {
.freq_tab_count = 2, \ .freq_tab_count = 2, \
.registers = &exynos3250_tmu_registers, \ .registers = &exynos3250_tmu_registers, \
.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \ .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \
TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \ TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_EMUL_TIME)
TMU_SUPPORT_EMUL_TIME)
#endif #endif
#if defined(CONFIG_SOC_EXYNOS3250) #if defined(CONFIG_SOC_EXYNOS3250)
@ -204,8 +202,7 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
.freq_tab_count = 2, \ .freq_tab_count = 2, \
.registers = &exynos4412_tmu_registers, \ .registers = &exynos4412_tmu_registers, \
.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \ .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \
TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \ TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_EMUL_TIME)
TMU_SUPPORT_EMUL_TIME)
#endif #endif
#if defined(CONFIG_SOC_EXYNOS4412) #if defined(CONFIG_SOC_EXYNOS4412)
@ -291,7 +288,7 @@ static const struct exynos_tmu_registers exynos5260_tmu_registers = {
__EXYNOS5260_TMU_DATA \ __EXYNOS5260_TMU_DATA \
.type = SOC_ARCH_EXYNOS5260, \ .type = SOC_ARCH_EXYNOS5260, \
.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_FALLING_TRIP | \ .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_FALLING_TRIP | \
TMU_SUPPORT_READY_STATUS | TMU_SUPPORT_EMUL_TIME) TMU_SUPPORT_EMUL_TIME)
struct exynos_tmu_init_data const exynos5260_default_tmu_data = { struct exynos_tmu_init_data const exynos5260_default_tmu_data = {
.tmu_data = { .tmu_data = {
@ -364,14 +361,13 @@ static const struct exynos_tmu_registers exynos5420_tmu_registers = {
__EXYNOS5420_TMU_DATA \ __EXYNOS5420_TMU_DATA \
.type = SOC_ARCH_EXYNOS5250, \ .type = SOC_ARCH_EXYNOS5250, \
.features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_FALLING_TRIP | \ .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_FALLING_TRIP | \
TMU_SUPPORT_READY_STATUS | TMU_SUPPORT_EMUL_TIME) TMU_SUPPORT_EMUL_TIME)
#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_FALLING_TRIP | \ .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_FALLING_TRIP | \
TMU_SUPPORT_READY_STATUS | TMU_SUPPORT_EMUL_TIME | \ TMU_SUPPORT_EMUL_TIME | 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 = {