thermal: exynos: remove needless triminfo_ctrl abstraction
reg->triminfo_ctrl[] is used in only exynos_tmu_initialize() and accessed only if TMU_SUPPORT_TRIM_RELOAD flag is set. This flag is set only on Exynos3250, Exynos4412 and Exynos5250 (other SoC types don't even have triminfo_ctrl[] entries assigned in their struct exynos_tmu_registers instances) so the register 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:
Родитель
6b1fbbdeba
Коммит
32f9520569
|
@ -27,7 +27,6 @@
|
||||||
#define SENSOR_NAME_LEN 16
|
#define SENSOR_NAME_LEN 16
|
||||||
#define MAX_TRIP_COUNT 8
|
#define MAX_TRIP_COUNT 8
|
||||||
#define MAX_COOLING_DEVICE 4
|
#define MAX_COOLING_DEVICE 4
|
||||||
#define MAX_TRIMINFO_CTRL_REG 2
|
|
||||||
|
|
||||||
#define ACTIVE_INTERVAL 500
|
#define ACTIVE_INTERVAL 500
|
||||||
#define IDLE_INTERVAL 10000
|
#define IDLE_INTERVAL 10000
|
||||||
|
|
|
@ -162,15 +162,14 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (TMU_SUPPORTS(pdata, TRIM_RELOAD)) {
|
if (TMU_SUPPORTS(pdata, TRIM_RELOAD)) {
|
||||||
for (i = 0; i < reg->triminfo_ctrl_count; i++) {
|
if (data->soc == SOC_ARCH_EXYNOS3250) {
|
||||||
if (pdata->triminfo_reload[i]) {
|
ctrl = readl(data->base + EXYNOS_TMU_TRIMINFO_CON1);
|
||||||
ctrl = readl(data->base +
|
ctrl |= EXYNOS_TRIMINFO_RELOAD_ENABLE;
|
||||||
reg->triminfo_ctrl[i]);
|
writel(ctrl, data->base + EXYNOS_TMU_TRIMINFO_CON1);
|
||||||
ctrl |= pdata->triminfo_reload[i];
|
|
||||||
writel(ctrl, data->base +
|
|
||||||
reg->triminfo_ctrl[i]);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
ctrl = readl(data->base + EXYNOS_TMU_TRIMINFO_CON2);
|
||||||
|
ctrl |= EXYNOS_TRIMINFO_RELOAD_ENABLE;
|
||||||
|
writel(ctrl, data->base + EXYNOS_TMU_TRIMINFO_CON2);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Save trimming info in order to perform calibration */
|
/* Save trimming info in order to perform calibration */
|
||||||
|
|
|
@ -76,8 +76,6 @@ enum soc_type {
|
||||||
* struct exynos_tmu_register - register descriptors to access registers and
|
* struct exynos_tmu_register - register descriptors to access registers and
|
||||||
* bitfields. The register validity, offsets and bitfield values may vary
|
* bitfields. The register validity, offsets and bitfield values may vary
|
||||||
* slightly across different exynos SOC's.
|
* slightly across different exynos SOC's.
|
||||||
* @triminfo_ctrl: trim info controller register.
|
|
||||||
* @triminfo_ctrl_count: the number of trim info controller register.
|
|
||||||
* @tmu_ctrl: TMU main controller register.
|
* @tmu_ctrl: TMU main controller register.
|
||||||
* @test_mux_addr_shift: shift bits of test mux address.
|
* @test_mux_addr_shift: shift bits of test mux address.
|
||||||
* @therm_trip_mode_shift: shift bits of tripping mode in tmu_ctrl register.
|
* @therm_trip_mode_shift: shift bits of tripping mode in tmu_ctrl register.
|
||||||
|
@ -104,9 +102,6 @@ enum soc_type {
|
||||||
* @tmu_pmin: register to get/set the Pmin value.
|
* @tmu_pmin: register to get/set the Pmin value.
|
||||||
*/
|
*/
|
||||||
struct exynos_tmu_registers {
|
struct exynos_tmu_registers {
|
||||||
u32 triminfo_ctrl[MAX_TRIMINFO_CTRL_REG];
|
|
||||||
u32 triminfo_ctrl_count;
|
|
||||||
|
|
||||||
u32 tmu_ctrl;
|
u32 tmu_ctrl;
|
||||||
u32 test_mux_addr_shift;
|
u32 test_mux_addr_shift;
|
||||||
u32 therm_trip_mode_shift;
|
u32 therm_trip_mode_shift;
|
||||||
|
@ -184,7 +179,6 @@ struct exynos_tmu_registers {
|
||||||
* @second_point_trim: temp value of the second point trimming
|
* @second_point_trim: temp value of the second point trimming
|
||||||
* @default_temp_offset: default temperature offset in case of no trimming
|
* @default_temp_offset: default temperature offset in case of no trimming
|
||||||
* @test_mux; information if SoC supports test MUX
|
* @test_mux; information if SoC supports test MUX
|
||||||
* @triminfo_reload: reload value to read TRIMINFO register
|
|
||||||
* @cal_type: calibration type for temperature
|
* @cal_type: calibration type for temperature
|
||||||
* @freq_clip_table: Table representing frequency reduction percentage.
|
* @freq_clip_table: Table representing frequency reduction percentage.
|
||||||
* @freq_tab_count: Count of the above table as frequency reduction may
|
* @freq_tab_count: Count of the above table as frequency reduction may
|
||||||
|
@ -215,7 +209,6 @@ struct exynos_tmu_platform_data {
|
||||||
u8 second_point_trim;
|
u8 second_point_trim;
|
||||||
u8 default_temp_offset;
|
u8 default_temp_offset;
|
||||||
u8 test_mux;
|
u8 test_mux;
|
||||||
u8 triminfo_reload[MAX_TRIMINFO_CTRL_REG];
|
|
||||||
|
|
||||||
enum calibration_type cal_type;
|
enum calibration_type cal_type;
|
||||||
enum soc_type type;
|
enum soc_type type;
|
||||||
|
|
|
@ -82,9 +82,6 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
|
||||||
|
|
||||||
#if defined(CONFIG_SOC_EXYNOS3250)
|
#if defined(CONFIG_SOC_EXYNOS3250)
|
||||||
static const struct exynos_tmu_registers exynos3250_tmu_registers = {
|
static const struct exynos_tmu_registers exynos3250_tmu_registers = {
|
||||||
.triminfo_ctrl[0] = EXYNOS_TMU_TRIMINFO_CON1,
|
|
||||||
.triminfo_ctrl[1] = EXYNOS_TMU_TRIMINFO_CON2,
|
|
||||||
.triminfo_ctrl_count = 2,
|
|
||||||
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
|
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
|
||||||
.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
|
.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
|
||||||
.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
|
.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
|
||||||
|
@ -140,8 +137,6 @@ static const struct exynos_tmu_registers exynos3250_tmu_registers = {
|
||||||
.temp_level = 95, \
|
.temp_level = 95, \
|
||||||
}, \
|
}, \
|
||||||
.freq_tab_count = 2, \
|
.freq_tab_count = 2, \
|
||||||
.triminfo_reload[0] = EXYNOS_TRIMINFO_RELOAD_ENABLE, \
|
|
||||||
.triminfo_reload[1] = EXYNOS_TRIMINFO_RELOAD_ENABLE, \
|
|
||||||
.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_READY_STATUS | \
|
||||||
|
@ -163,8 +158,6 @@ struct exynos_tmu_init_data const exynos3250_default_tmu_data = {
|
||||||
|
|
||||||
#if defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250)
|
#if defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250)
|
||||||
static const struct exynos_tmu_registers exynos4412_tmu_registers = {
|
static const struct exynos_tmu_registers exynos4412_tmu_registers = {
|
||||||
.triminfo_ctrl[0] = EXYNOS_TMU_TRIMINFO_CON2,
|
|
||||||
.triminfo_ctrl_count = 1,
|
|
||||||
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
|
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
|
||||||
.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
|
.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
|
||||||
.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
|
.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
|
||||||
|
@ -221,7 +214,6 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
|
||||||
.temp_level = 95, \
|
.temp_level = 95, \
|
||||||
}, \
|
}, \
|
||||||
.freq_tab_count = 2, \
|
.freq_tab_count = 2, \
|
||||||
.triminfo_reload[0] = EXYNOS_TRIMINFO_RELOAD_ENABLE, \
|
|
||||||
.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_READY_STATUS | \
|
||||||
|
|
Загрузка…
Ссылка в новой задаче