aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/thermal/samsung/exynos_tmu_data.c9
-rw-r--r--drivers/thermal/samsung/exynos_tmu_data.h7
2 files changed, 12 insertions, 4 deletions
diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
index 362a1e148551..8bae1704b9bd 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.c
+++ b/drivers/thermal/samsung/exynos_tmu_data.c
@@ -87,6 +87,9 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
87#if defined(CONFIG_SOC_EXYNOS3250) 87#if defined(CONFIG_SOC_EXYNOS3250)
88static const struct exynos_tmu_registers exynos3250_tmu_registers = { 88static const struct exynos_tmu_registers exynos3250_tmu_registers = {
89 .triminfo_data = EXYNOS_TMU_REG_TRIMINFO, 89 .triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
90 .triminfo_ctrl[0] = EXYNOS_TMU_TRIMINFO_CON1,
91 .triminfo_ctrl[1] = EXYNOS_TMU_TRIMINFO_CON2,
92 .triminfo_ctrl_count = 2,
90 .tmu_ctrl = EXYNOS_TMU_REG_CONTROL, 93 .tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
91 .test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT, 94 .test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
92 .therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT, 95 .therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
@@ -147,8 +150,10 @@ static const struct exynos_tmu_registers exynos3250_tmu_registers = {
147 .temp_level = 95, \ 150 .temp_level = 95, \
148 }, \ 151 }, \
149 .freq_tab_count = 2, \ 152 .freq_tab_count = 2, \
153 .triminfo_reload[0] = EXYNOS_TRIMINFO_RELOAD_ENABLE, \
154 .triminfo_reload[1] = EXYNOS_TRIMINFO_RELOAD_ENABLE, \
150 .registers = &exynos3250_tmu_registers, \ 155 .registers = &exynos3250_tmu_registers, \
151 .features = (TMU_SUPPORT_EMULATION | \ 156 .features = (TMU_SUPPORT_EMULATION | TMU_SUPPORT_TRIM_RELOAD | \
152 TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \ 157 TMU_SUPPORT_FALLING_TRIP | TMU_SUPPORT_READY_STATUS | \
153 TMU_SUPPORT_EMUL_TIME) 158 TMU_SUPPORT_EMUL_TIME)
154#endif 159#endif
@@ -169,7 +174,7 @@ struct exynos_tmu_init_data const exynos3250_default_tmu_data = {
169#if defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250) 174#if defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250)
170static const struct exynos_tmu_registers exynos4412_tmu_registers = { 175static const struct exynos_tmu_registers exynos4412_tmu_registers = {
171 .triminfo_data = EXYNOS_TMU_REG_TRIMINFO, 176 .triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
172 .triminfo_ctrl[0] = EXYNOS_TMU_TRIMINFO_CON, 177 .triminfo_ctrl[0] = EXYNOS_TMU_TRIMINFO_CON2,
173 .triminfo_ctrl_count = 1, 178 .triminfo_ctrl_count = 1,
174 .tmu_ctrl = EXYNOS_TMU_REG_CONTROL, 179 .tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
175 .test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT, 180 .test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/thermal/samsung/exynos_tmu_data.h
index 6b47a174c8fa..4b8f33c85b35 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.h
+++ b/drivers/thermal/samsung/exynos_tmu_data.h
@@ -39,14 +39,17 @@
39#define EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT 8 39#define EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT 8
40#define EXYNOS_TMU_CORE_EN_SHIFT 0 40#define EXYNOS_TMU_CORE_EN_SHIFT 0
41 41
42/* Exynos3250 specific registers */
43#define EXYNOS_TMU_TRIMINFO_CON1 0x10
44
42/* Exynos4210 specific registers */ 45/* Exynos4210 specific registers */
43#define EXYNOS4210_TMU_REG_THRESHOLD_TEMP 0x44 46#define EXYNOS4210_TMU_REG_THRESHOLD_TEMP 0x44
44#define EXYNOS4210_TMU_REG_TRIG_LEVEL0 0x50 47#define EXYNOS4210_TMU_REG_TRIG_LEVEL0 0x50
45 48
46#define EXYNOS4210_TMU_TRIG_LEVEL_MASK 0x1111 49#define EXYNOS4210_TMU_TRIG_LEVEL_MASK 0x1111
47 50
48/* Exynos5250 and Exynos4412 specific registers */ 51/* Exynos5250, Exynos4412, Exynos3250 specific registers */
49#define EXYNOS_TMU_TRIMINFO_CON 0x14 52#define EXYNOS_TMU_TRIMINFO_CON2 0x14
50#define EXYNOS_THD_TEMP_RISE 0x50 53#define EXYNOS_THD_TEMP_RISE 0x50
51#define EXYNOS_THD_TEMP_FALL 0x54 54#define EXYNOS_THD_TEMP_FALL 0x54
52#define EXYNOS_EMUL_CON 0x80 55#define EXYNOS_EMUL_CON 0x80