thermal: exynos: remove needless emul_temp_shift abstraction
reg->emul_temp_shift is used only in exynos_tmu_set_emulation() and accessed only if TMU_SUPPORT_EMULATION flag is set. This flag is not set for Exynos4210 (reg->emul_temp_shift field is not even assigned in exynos4210_tmu_registers and is assigned to identical value for all other SoC types) so the abstraction is not needed and can be removed. 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:
parent
77a37a92ca
commit
9e288d6430
|
@ -383,8 +383,8 @@ static int exynos_tmu_set_emulation(void *drv_data, unsigned long temp)
|
||||||
val &= ~(EXYNOS_EMUL_TIME_MASK << reg->emul_time_shift);
|
val &= ~(EXYNOS_EMUL_TIME_MASK << reg->emul_time_shift);
|
||||||
val |= (EXYNOS_EMUL_TIME << reg->emul_time_shift);
|
val |= (EXYNOS_EMUL_TIME << reg->emul_time_shift);
|
||||||
}
|
}
|
||||||
val &= ~(EXYNOS_EMUL_DATA_MASK << reg->emul_temp_shift);
|
val &= ~(EXYNOS_EMUL_DATA_MASK << EXYNOS_EMUL_DATA_SHIFT);
|
||||||
val |= (temp_to_code(data, temp) << reg->emul_temp_shift) |
|
val |= (temp_to_code(data, temp) << EXYNOS_EMUL_DATA_SHIFT) |
|
||||||
EXYNOS_EMUL_ENABLE;
|
EXYNOS_EMUL_ENABLE;
|
||||||
} else {
|
} else {
|
||||||
val &= ~EXYNOS_EMUL_ENABLE;
|
val &= ~EXYNOS_EMUL_ENABLE;
|
||||||
|
|
|
@ -92,7 +92,6 @@ enum soc_type {
|
||||||
* @tmu_intstat: Register containing the interrupt status values.
|
* @tmu_intstat: Register containing the interrupt status values.
|
||||||
* @tmu_intclear: Register for clearing the raised interrupt status.
|
* @tmu_intclear: Register for clearing the raised interrupt status.
|
||||||
* @emul_con: TMU emulation controller register.
|
* @emul_con: TMU emulation controller register.
|
||||||
* @emul_temp_shift: shift bits of emulation temperature.
|
|
||||||
* @emul_time_shift: shift bits of emulation time.
|
* @emul_time_shift: shift bits of emulation time.
|
||||||
* @tmu_irqstatus: register to find which TMU generated interrupts.
|
* @tmu_irqstatus: register to find which TMU generated interrupts.
|
||||||
* @tmu_pmin: register to get/set the Pmin value.
|
* @tmu_pmin: register to get/set the Pmin value.
|
||||||
|
@ -119,7 +118,6 @@ struct exynos_tmu_registers {
|
||||||
u32 tmu_intclear;
|
u32 tmu_intclear;
|
||||||
|
|
||||||
u32 emul_con;
|
u32 emul_con;
|
||||||
u32 emul_temp_shift;
|
|
||||||
u32 emul_time_shift;
|
u32 emul_time_shift;
|
||||||
|
|
||||||
u32 tmu_irqstatus;
|
u32 tmu_irqstatus;
|
||||||
|
|
|
@ -94,7 +94,6 @@ static const struct exynos_tmu_registers exynos3250_tmu_registers = {
|
||||||
.tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
|
.tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
|
||||||
.tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
|
.tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
|
||||||
.emul_con = EXYNOS_EMUL_CON,
|
.emul_con = EXYNOS_EMUL_CON,
|
||||||
.emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
|
|
||||||
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
|
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -167,7 +166,6 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
|
||||||
.tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
|
.tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
|
||||||
.tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
|
.tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
|
||||||
.emul_con = EXYNOS_EMUL_CON,
|
.emul_con = EXYNOS_EMUL_CON,
|
||||||
.emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
|
|
||||||
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
|
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -252,7 +250,6 @@ static const struct exynos_tmu_registers exynos5260_tmu_registers = {
|
||||||
.tmu_intstat = EXYNOS5260_TMU_REG_INTSTAT,
|
.tmu_intstat = EXYNOS5260_TMU_REG_INTSTAT,
|
||||||
.tmu_intclear = EXYNOS5260_TMU_REG_INTCLEAR,
|
.tmu_intclear = EXYNOS5260_TMU_REG_INTCLEAR,
|
||||||
.emul_con = EXYNOS5260_EMUL_CON,
|
.emul_con = EXYNOS5260_EMUL_CON,
|
||||||
.emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
|
|
||||||
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
|
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -327,7 +324,6 @@ static const struct exynos_tmu_registers exynos5420_tmu_registers = {
|
||||||
.tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
|
.tmu_intstat = EXYNOS_TMU_REG_INTSTAT,
|
||||||
.tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
|
.tmu_intclear = EXYNOS_TMU_REG_INTCLEAR,
|
||||||
.emul_con = EXYNOS_EMUL_CON,
|
.emul_con = EXYNOS_EMUL_CON,
|
||||||
.emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
|
|
||||||
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
|
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -411,7 +407,6 @@ static const struct exynos_tmu_registers exynos5440_tmu_registers = {
|
||||||
.tmu_intclear = EXYNOS5440_TMU_S0_7_IRQ,
|
.tmu_intclear = EXYNOS5440_TMU_S0_7_IRQ,
|
||||||
.tmu_irqstatus = EXYNOS5440_TMU_IRQ_STATUS,
|
.tmu_irqstatus = EXYNOS5440_TMU_IRQ_STATUS,
|
||||||
.emul_con = EXYNOS5440_TMU_S0_7_DEBUG,
|
.emul_con = EXYNOS5440_TMU_S0_7_DEBUG,
|
||||||
.emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
|
|
||||||
.tmu_pmin = EXYNOS5440_TMU_PMIN,
|
.tmu_pmin = EXYNOS5440_TMU_PMIN,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue