* [PATCH v3 1/8] thermal: exynos: remove unused struct exynos_tmu_registers entries
2014-07-31 17:10 [PATCH v3 0/8] thermal: exynos: various cleanups Bartlomiej Zolnierkiewicz
@ 2014-07-31 17:10 ` Bartlomiej Zolnierkiewicz
2014-07-31 17:11 ` [PATCH v3 2/8] thermal: exynos: remove dead code for HW_MODE calibration Bartlomiej Zolnierkiewicz
` (7 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-07-31 17:10 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Zhang Rui, Amit Daniel Kachhap, Tomasz Figa, Rafael J. Wysocki,
Kyungmin Park, linux-samsung-soc, linux-pm, linux-kernel,
b.zolnierkie
Remove unused / write-only entries from struct exynos_tmu_registers.
Then remove unused defines while at it.
We don't keep the unused/untested features in the kernel just
in case that some future hardware might need it. Such code has
a real maintainance cost (all other code changes have to take
the dead code into account) and usually makes future changes
more difficult, not easier (i.e. recent additions of Exynos5420
SoC and Exynos5260 SoC thermal support has not made use of any
of the driver's currently unused/untested features, moreover
the recently added code is more complex than needed because of
the existing dead code). Also all removed dead code is still
accessible in the kernel git repository and can be easily
brought back if/when needed.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.h | 40 -------------------------------
drivers/thermal/samsung/exynos_tmu_data.c | 5 ----
drivers/thermal/samsung/exynos_tmu_data.h | 29 +---------------------
3 files changed, 1 insertion(+), 73 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
index 1b4a644..44ca633 100644
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -85,8 +85,6 @@ enum soc_type {
* @triminfo_25_shift: shift bit of the 25 C trim value in triminfo_data reg.
* @triminfo_85_shift: shift bit of the 85 C trim value in triminfo_data reg.
* @triminfo_ctrl: trim info controller register.
- * @triminfo_reload_shift: shift of triminfo reload enable bit in triminfo_ctrl
- reg.
* @tmu_ctrl: TMU main controller register.
* @test_mux_addr_shift: shift bits of test mux address.
* @buf_vref_sel_shift: shift bits of reference voltage in tmu_ctrl register.
@@ -101,27 +99,13 @@ enum soc_type {
register.
* @calib_mode_mask: mask bits of calibration mode value in tmu_ctrl
register.
- * @therm_trip_tq_en_shift: shift bits of thermal trip enable by TQ pin in
- tmu_ctrl register.
* @core_en_shift: shift bits of TMU core enable bit in tmu_ctrl register.
* @tmu_status: register drescribing the TMU status.
* @tmu_cur_temp: register containing the current temperature of the TMU.
- * @tmu_cur_temp_shift: shift bits of current temp value in tmu_cur_temp
- register.
* @threshold_temp: register containing the base threshold level.
* @threshold_th0: Register containing first set of rising levels.
- * @threshold_th0_l0_shift: shift bits of level0 threshold temperature.
- * @threshold_th0_l1_shift: shift bits of level1 threshold temperature.
- * @threshold_th0_l2_shift: shift bits of level2 threshold temperature.
- * @threshold_th0_l3_shift: shift bits of level3 threshold temperature.
* @threshold_th1: Register containing second set of rising levels.
- * @threshold_th1_l0_shift: shift bits of level0 threshold temperature.
- * @threshold_th1_l1_shift: shift bits of level1 threshold temperature.
- * @threshold_th1_l2_shift: shift bits of level2 threshold temperature.
- * @threshold_th1_l3_shift: shift bits of level3 threshold temperature.
* @threshold_th2: Register containing third set of rising levels.
- * @threshold_th2_l0_shift: shift bits of level0 threshold temperature.
- * @threshold_th3: Register containing fourth set of rising levels.
* @threshold_th3_l0_shift: shift bits of level0 threshold temperature.
* @tmu_inten: register containing the different threshold interrupt
enable bits.
@@ -130,9 +114,6 @@ enum soc_type {
* @inten_rise2_shift: shift bits of rising 2 interrupt bits.
* @inten_rise3_shift: shift bits of rising 3 interrupt bits.
* @inten_fall0_shift: shift bits of falling 0 interrupt bits.
- * @inten_fall1_shift: shift bits of falling 1 interrupt bits.
- * @inten_fall2_shift: shift bits of falling 2 interrupt bits.
- * @inten_fall3_shift: shift bits of falling 3 interrupt bits.
* @tmu_intstat: Register containing the interrupt status values.
* @tmu_intclear: Register for clearing the raised interrupt status.
* @intclr_fall_shift: shift bits for interrupt clear fall 0
@@ -142,7 +123,6 @@ enum soc_type {
* @emul_con: TMU emulation controller register.
* @emul_temp_shift: shift bits of emulation temperature.
* @emul_time_shift: shift bits of emulation time.
- * @emul_time_mask: mask bits of emulation time.
* @tmu_irqstatus: register to find which TMU generated interrupts.
* @tmu_pmin: register to get/set the Pmin value.
*/
@@ -153,7 +133,6 @@ struct exynos_tmu_registers {
u32 triminfo_ctrl;
u32 triminfo_ctrl1;
- u32 triminfo_reload_shift;
u32 tmu_ctrl;
u32 test_mux_addr_shift;
@@ -166,32 +145,17 @@ struct exynos_tmu_registers {
u32 buf_slope_sel_mask;
u32 calib_mode_shift;
u32 calib_mode_mask;
- u32 therm_trip_tq_en_shift;
u32 core_en_shift;
u32 tmu_status;
u32 tmu_cur_temp;
- u32 tmu_cur_temp_shift;
u32 threshold_temp;
u32 threshold_th0;
- u32 threshold_th0_l0_shift;
- u32 threshold_th0_l1_shift;
- u32 threshold_th0_l2_shift;
- u32 threshold_th0_l3_shift;
-
u32 threshold_th1;
- u32 threshold_th1_l0_shift;
- u32 threshold_th1_l1_shift;
- u32 threshold_th1_l2_shift;
- u32 threshold_th1_l3_shift;
-
u32 threshold_th2;
- u32 threshold_th2_l0_shift;
-
- u32 threshold_th3;
u32 threshold_th3_l0_shift;
u32 tmu_inten;
@@ -200,9 +164,6 @@ struct exynos_tmu_registers {
u32 inten_rise2_shift;
u32 inten_rise3_shift;
u32 inten_fall0_shift;
- u32 inten_fall1_shift;
- u32 inten_fall2_shift;
- u32 inten_fall3_shift;
u32 tmu_intstat;
@@ -215,7 +176,6 @@ struct exynos_tmu_registers {
u32 emul_con;
u32 emul_temp_shift;
u32 emul_time_shift;
- u32 emul_time_mask;
u32 tmu_irqstatus;
u32 tmu_pmin;
diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
index aa8e0de..d5cdfe5 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.c
+++ b/drivers/thermal/samsung/exynos_tmu_data.c
@@ -123,7 +123,6 @@ static const struct exynos_tmu_registers exynos3250_tmu_registers = {
.emul_con = EXYNOS_EMUL_CON,
.emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
- .emul_time_mask = EXYNOS_EMUL_TIME_MASK,
};
#define EXYNOS3250_TMU_DATA \
@@ -185,7 +184,6 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
.triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
.triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
.triminfo_ctrl = EXYNOS_TMU_TRIMINFO_CON,
- .triminfo_reload_shift = EXYNOS_TRIMINFO_RELOAD_SHIFT,
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
.buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
@@ -215,7 +213,6 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
.emul_con = EXYNOS_EMUL_CON,
.emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
- .emul_time_mask = EXYNOS_EMUL_TIME_MASK,
};
#define EXYNOS4412_TMU_DATA \
@@ -317,7 +314,6 @@ static const struct exynos_tmu_registers exynos5260_tmu_registers = {
.emul_con = EXYNOS5260_EMUL_CON,
.emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
- .emul_time_mask = EXYNOS_EMUL_TIME_MASK,
};
#define __EXYNOS5260_TMU_DATA \
@@ -409,7 +405,6 @@ static const struct exynos_tmu_registers exynos5420_tmu_registers = {
.emul_con = EXYNOS_EMUL_CON,
.emul_temp_shift = EXYNOS_EMUL_DATA_SHIFT,
.emul_time_shift = EXYNOS_EMUL_TIME_SHIFT,
- .emul_time_mask = EXYNOS_EMUL_TIME_MASK,
};
#define __EXYNOS5420_TMU_DATA \
diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/thermal/samsung/exynos_tmu_data.h
index f0979e5..9337c5a 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.h
+++ b/drivers/thermal/samsung/exynos_tmu_data.h
@@ -42,20 +42,8 @@
/* Exynos4210 specific registers */
#define EXYNOS4210_TMU_REG_THRESHOLD_TEMP 0x44
#define EXYNOS4210_TMU_REG_TRIG_LEVEL0 0x50
-#define EXYNOS4210_TMU_REG_TRIG_LEVEL1 0x54
-#define EXYNOS4210_TMU_REG_TRIG_LEVEL2 0x58
-#define EXYNOS4210_TMU_REG_TRIG_LEVEL3 0x5C
-#define EXYNOS4210_TMU_REG_PAST_TEMP0 0x60
-#define EXYNOS4210_TMU_REG_PAST_TEMP1 0x64
-#define EXYNOS4210_TMU_REG_PAST_TEMP2 0x68
-#define EXYNOS4210_TMU_REG_PAST_TEMP3 0x6C
-
-#define EXYNOS4210_TMU_TRIG_LEVEL0_MASK 0x1
-#define EXYNOS4210_TMU_TRIG_LEVEL1_MASK 0x10
-#define EXYNOS4210_TMU_TRIG_LEVEL2_MASK 0x100
-#define EXYNOS4210_TMU_TRIG_LEVEL3_MASK 0x1000
+
#define EXYNOS4210_TMU_TRIG_LEVEL_MASK 0x1111
-#define EXYNOS4210_TMU_INTCLEAR_VAL 0x1111
/* Exynos5250 and Exynos4412 specific registers */
#define EXYNOS_TMU_TRIMINFO_CON 0x14
@@ -63,14 +51,11 @@
#define EXYNOS_THD_TEMP_FALL 0x54
#define EXYNOS_EMUL_CON 0x80
-#define EXYNOS_TRIMINFO_RELOAD_SHIFT 1
#define EXYNOS_TRIMINFO_25_SHIFT 0
#define EXYNOS_TRIMINFO_85_SHIFT 8
#define EXYNOS_TMU_RISE_INT_MASK 0x111
#define EXYNOS_TMU_RISE_INT_SHIFT 0
#define EXYNOS_TMU_FALL_INT_MASK 0x111
-#define EXYNOS_TMU_CLEAR_RISE_INT 0x111
-#define EXYNOS_TMU_CLEAR_FALL_INT (0x111 << 12)
#define EXYNOS_TMU_CLEAR_FALL_INT_SHIFT 12
#define EXYNOS5420_TMU_CLEAR_FALL_INT_SHIFT 16
#define EXYNOS5440_TMU_CLEAR_FALL_INT_SHIFT 4
@@ -85,9 +70,6 @@
#define EXYNOS_TMU_INTEN_RISE2_SHIFT 8
#define EXYNOS_TMU_INTEN_RISE3_SHIFT 12
#define EXYNOS_TMU_INTEN_FALL0_SHIFT 16
-#define EXYNOS_TMU_INTEN_FALL1_SHIFT 20
-#define EXYNOS_TMU_INTEN_FALL2_SHIFT 24
-#define EXYNOS_TMU_INTEN_FALL3_SHIFT 28
#define EXYNOS_EMUL_TIME 0x57F0
#define EXYNOS_EMUL_TIME_MASK 0xffff
@@ -122,13 +104,11 @@
#define EXYNOS5440_TMU_S0_7_TH0 0x110
#define EXYNOS5440_TMU_S0_7_TH1 0x130
#define EXYNOS5440_TMU_S0_7_TH2 0x150
-#define EXYNOS5440_TMU_S0_7_EVTEN 0x1F0
#define EXYNOS5440_TMU_S0_7_IRQEN 0x210
#define EXYNOS5440_TMU_S0_7_IRQ 0x230
/* exynos5440 common registers */
#define EXYNOS5440_TMU_IRQ_STATUS 0x000
#define EXYNOS5440_TMU_PMIN 0x004
-#define EXYNOS5440_TMU_TEMP 0x008
#define EXYNOS5440_TMU_RISE_INT_MASK 0xf
#define EXYNOS5440_TMU_RISE_INT_SHIFT 0
@@ -138,13 +118,6 @@
#define EXYNOS5440_TMU_INTEN_RISE2_SHIFT 2
#define EXYNOS5440_TMU_INTEN_RISE3_SHIFT 3
#define EXYNOS5440_TMU_INTEN_FALL0_SHIFT 4
-#define EXYNOS5440_TMU_INTEN_FALL1_SHIFT 5
-#define EXYNOS5440_TMU_INTEN_FALL2_SHIFT 6
-#define EXYNOS5440_TMU_INTEN_FALL3_SHIFT 7
-#define EXYNOS5440_TMU_TH_RISE0_SHIFT 0
-#define EXYNOS5440_TMU_TH_RISE1_SHIFT 8
-#define EXYNOS5440_TMU_TH_RISE2_SHIFT 16
-#define EXYNOS5440_TMU_TH_RISE3_SHIFT 24
#define EXYNOS5440_TMU_TH_RISE4_SHIFT 24
#define EXYNOS5440_EFUSE_SWAP_OFFSET 8
--
1.8.2.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 2/8] thermal: exynos: remove dead code for HW_MODE calibration
2014-07-31 17:10 [PATCH v3 0/8] thermal: exynos: various cleanups Bartlomiej Zolnierkiewicz
2014-07-31 17:10 ` [PATCH v3 1/8] thermal: exynos: remove unused struct exynos_tmu_registers entries Bartlomiej Zolnierkiewicz
@ 2014-07-31 17:11 ` Bartlomiej Zolnierkiewicz
2014-07-31 17:11 ` [PATCH v3 3/8] thermal: exynos: remove redundant pdata checks from exynos_tmu_initialize() Bartlomiej Zolnierkiewicz
` (6 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-07-31 17:11 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Zhang Rui, Amit Daniel Kachhap, Tomasz Figa, Rafael J. Wysocki,
Kyungmin Park, linux-samsung-soc, linux-pm, linux-kernel,
b.zolnierkie
The commit 1928457 ("thermal: exynos: Add hardware mode thermal
calibration support") has added HW_MODE feature but it has never
been enabled. As such it has been a dead code for over a year
now and should be removed from the kernel.
We don't keep the unused/untested features in the kernel just
in case that some future hardware might need it. Such code has
a real maintainance cost (all other code changes have to take
the dead code into account) and usually makes future changes
more difficult, not easier (i.e. recent additions of Exynos5420
SoC and Exynos5260 SoC thermal support has not made use of any
of the driver's currently unused/untested features, moreover
the recently added code is more complex than needed because of
the existing dead code). Also all removed dead code is still
accessible in the kernel git repository and can be easily
brought back if/when needed.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.c | 33 +------------------------------
drivers/thermal/samsung/exynos_tmu.h | 13 ------------
drivers/thermal/samsung/exynos_tmu_data.c | 3 ---
drivers/thermal/samsung/exynos_tmu_data.h | 2 --
4 files changed, 1 insertion(+), 50 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index acbff14..4a55f11 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -77,9 +77,6 @@ static int temp_to_code(struct exynos_tmu_data *data, u8 temp)
struct exynos_tmu_platform_data *pdata = data->pdata;
int temp_code;
- if (pdata->cal_mode == HW_MODE)
- return temp;
-
if (data->soc == SOC_ARCH_EXYNOS4210)
/* temp should range between 25 and 125 */
if (temp < 25 || temp > 125) {
@@ -114,9 +111,6 @@ static int code_to_temp(struct exynos_tmu_data *data, u8 temp_code)
struct exynos_tmu_platform_data *pdata = data->pdata;
int temp;
- if (pdata->cal_mode == HW_MODE)
- return temp_code;
-
if (data->soc == SOC_ARCH_EXYNOS4210)
/* temp_code should range between 75 and 175 */
if (temp_code < 75 || temp_code > 175) {
@@ -167,9 +161,6 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
if (TMU_SUPPORTS(pdata, TRIM_RELOAD))
__raw_writel(1, data->base + reg->triminfo_ctrl);
- if (pdata->cal_mode == HW_MODE)
- goto skip_calib_data;
-
/* Save trimming info in order to perform calibration */
if (data->soc == SOC_ARCH_EXYNOS5440) {
/*
@@ -210,7 +201,6 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
(pdata->efuse_value >> reg->triminfo_85_shift) &
EXYNOS_TMU_TEMP_MASK;
-skip_calib_data:
if (pdata->max_trigger_level > MAX_THRESHOLD_LEVS) {
dev_err(&pdev->dev, "Invalid max trigger level\n");
ret = -EINVAL;
@@ -325,7 +315,7 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
struct exynos_tmu_data *data = platform_get_drvdata(pdev);
struct exynos_tmu_platform_data *pdata = data->pdata;
const struct exynos_tmu_registers *reg = pdata->registers;
- unsigned int con, interrupt_en, cal_val;
+ unsigned int con, interrupt_en;
mutex_lock(&data->lock);
clk_enable(data->clk);
@@ -351,27 +341,6 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
con |= (pdata->noise_cancel_mode << reg->therm_trip_mode_shift);
}
- if (pdata->cal_mode == HW_MODE) {
- con &= ~(reg->calib_mode_mask << reg->calib_mode_shift);
- cal_val = 0;
- switch (pdata->cal_type) {
- case TYPE_TWO_POINT_TRIMMING:
- cal_val = 3;
- break;
- case TYPE_ONE_POINT_TRIMMING_85:
- cal_val = 2;
- break;
- case TYPE_ONE_POINT_TRIMMING_25:
- cal_val = 1;
- break;
- case TYPE_NONE:
- break;
- default:
- dev_err(&pdev->dev, "Invalid calibration type, using none\n");
- }
- con |= cal_val << reg->calib_mode_shift;
- }
-
if (on) {
con |= (1 << reg->core_en_shift);
interrupt_en =
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
index 44ca633..789a8f7 100644
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -34,11 +34,6 @@ enum calibration_type {
TYPE_NONE,
};
-enum calibration_mode {
- SW_MODE,
- HW_MODE,
-};
-
enum soc_type {
SOC_ARCH_EXYNOS3250 = 1,
SOC_ARCH_EXYNOS4210,
@@ -95,10 +90,6 @@ enum soc_type {
* @buf_slope_sel_shift: shift bits of amplifier gain value in tmu_ctrl
register.
* @buf_slope_sel_mask: mask bits of amplifier gain value in tmu_ctrl register.
- * @calib_mode_shift: shift bits of calibration mode value in tmu_ctrl
- register.
- * @calib_mode_mask: mask bits of calibration mode value in tmu_ctrl
- register.
* @core_en_shift: shift bits of TMU core enable bit in tmu_ctrl register.
* @tmu_status: register drescribing the TMU status.
* @tmu_cur_temp: register containing the current temperature of the TMU.
@@ -143,8 +134,6 @@ struct exynos_tmu_registers {
u32 therm_trip_en_shift;
u32 buf_slope_sel_shift;
u32 buf_slope_sel_mask;
- u32 calib_mode_shift;
- u32 calib_mode_mask;
u32 core_en_shift;
u32 tmu_status;
@@ -226,7 +215,6 @@ struct exynos_tmu_registers {
* @default_temp_offset: default temperature offset in case of no trimming
* @test_mux; information if SoC supports test MUX
* @cal_type: calibration type for temperature
- * @cal_mode: calibration mode for temperature
* @freq_clip_table: Table representing frequency reduction percentage.
* @freq_tab_count: Count of the above table as frequency reduction may
* applicable to only some of the trigger levels.
@@ -257,7 +245,6 @@ struct exynos_tmu_platform_data {
u8 test_mux;
enum calibration_type cal_type;
- enum calibration_mode cal_mode;
enum soc_type type;
struct freq_clip_table freq_tab[4];
unsigned int freq_tab_count;
diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
index d5cdfe5..1d05bf8 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.c
+++ b/drivers/thermal/samsung/exynos_tmu_data.c
@@ -482,8 +482,6 @@ static const struct exynos_tmu_registers exynos5440_tmu_registers = {
.therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
.buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
.buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
- .calib_mode_shift = EXYNOS_TMU_CALIB_MODE_SHIFT,
- .calib_mode_mask = EXYNOS_TMU_CALIB_MODE_MASK,
.core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
.tmu_status = EXYNOS5440_TMU_S0_7_STATUS,
.tmu_cur_temp = EXYNOS5440_TMU_S0_7_TEMP,
@@ -520,7 +518,6 @@ static const struct exynos_tmu_registers exynos5440_tmu_registers = {
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
.cal_type = TYPE_ONE_POINT_TRIMMING, \
- .cal_mode = 0, \
.efuse_value = 0x5b2d, \
.min_efuse_value = 16, \
.max_efuse_value = 76, \
diff --git a/drivers/thermal/samsung/exynos_tmu_data.h b/drivers/thermal/samsung/exynos_tmu_data.h
index 9337c5a..ac03b76 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.h
+++ b/drivers/thermal/samsung/exynos_tmu_data.h
@@ -62,8 +62,6 @@
#define EXYNOS_TMU_TRIP_MODE_SHIFT 13
#define EXYNOS_TMU_TRIP_MODE_MASK 0x7
#define EXYNOS_TMU_THERM_TRIP_EN_SHIFT 12
-#define EXYNOS_TMU_CALIB_MODE_SHIFT 4
-#define EXYNOS_TMU_CALIB_MODE_MASK 0x3
#define EXYNOS_TMU_INTEN_RISE0_SHIFT 0
#define EXYNOS_TMU_INTEN_RISE1_SHIFT 4
--
1.8.2.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 3/8] thermal: exynos: remove redundant pdata checks from exynos_tmu_initialize()
2014-07-31 17:10 [PATCH v3 0/8] thermal: exynos: various cleanups Bartlomiej Zolnierkiewicz
2014-07-31 17:10 ` [PATCH v3 1/8] thermal: exynos: remove unused struct exynos_tmu_registers entries Bartlomiej Zolnierkiewicz
2014-07-31 17:11 ` [PATCH v3 2/8] thermal: exynos: remove dead code for HW_MODE calibration Bartlomiej Zolnierkiewicz
@ 2014-07-31 17:11 ` Bartlomiej Zolnierkiewicz
2014-07-31 17:11 ` [PATCH v3 4/8] thermal: exynos: remove redundant threshold_code " Bartlomiej Zolnierkiewicz
` (5 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-07-31 17:11 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Zhang Rui, Amit Daniel Kachhap, Tomasz Figa, Rafael J. Wysocki,
Kyungmin Park, linux-samsung-soc, linux-pm, linux-kernel,
b.zolnierkie
Remove runtime checks for pdata sanity from exynos_tmu_initialize().
The current values hardcoded in pdata will never trigger the checks
and checking itself is not proper. The checks in question are done
at runtime in a production code for data that is hardcoded inside
driver during development time and later it doesn't change. Such
data should be verified during development and review time (i.e. by
a script parsing relevant data from exynos_tmu_data.c, one can also
argue that verification to be done is so simple that the review by
a maintainer should be enough).
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/thermal/samsung/exynos_thermal_common.h | 1 -
drivers/thermal/samsung/exynos_tmu.c | 13 -------------
2 files changed, 14 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h
index 3eb2ed9..cd44719 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.h
+++ b/drivers/thermal/samsung/exynos_thermal_common.h
@@ -27,7 +27,6 @@
#define SENSOR_NAME_LEN 16
#define MAX_TRIP_COUNT 8
#define MAX_COOLING_DEVICE 4
-#define MAX_THRESHOLD_LEVS 5
#define ACTIVE_INTERVAL 500
#define IDLE_INTERVAL 10000
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 4a55f11..b9bffad 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -201,23 +201,10 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
(pdata->efuse_value >> reg->triminfo_85_shift) &
EXYNOS_TMU_TEMP_MASK;
- if (pdata->max_trigger_level > MAX_THRESHOLD_LEVS) {
- dev_err(&pdev->dev, "Invalid max trigger level\n");
- ret = -EINVAL;
- goto out;
- }
-
for (i = 0; i < pdata->max_trigger_level; i++) {
if (!pdata->trigger_levels[i])
continue;
- if ((pdata->trigger_type[i] == HW_TRIP) &&
- (!pdata->trigger_levels[pdata->max_trigger_level - 1])) {
- dev_err(&pdev->dev, "Invalid hw trigger level\n");
- ret = -EINVAL;
- goto out;
- }
-
/* Count trigger levels except the HW trip*/
if (!(pdata->trigger_type[i] == HW_TRIP))
trigger_levs++;
--
1.8.2.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 4/8] thermal: exynos: remove redundant threshold_code checks from exynos_tmu_initialize()
2014-07-31 17:10 [PATCH v3 0/8] thermal: exynos: various cleanups Bartlomiej Zolnierkiewicz
` (2 preceding siblings ...)
2014-07-31 17:11 ` [PATCH v3 3/8] thermal: exynos: remove redundant pdata checks from exynos_tmu_initialize() Bartlomiej Zolnierkiewicz
@ 2014-07-31 17:11 ` Bartlomiej Zolnierkiewicz
2014-07-31 17:11 ` [PATCH v3 5/8] thermal: exynos: simplify temp_to_code() and code_to_temp() Bartlomiej Zolnierkiewicz
` (4 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-07-31 17:11 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Zhang Rui, Amit Daniel Kachhap, Tomasz Figa, Rafael J. Wysocki,
Kyungmin Park, linux-samsung-soc, linux-pm, linux-kernel,
b.zolnierkie
Remove runtime checks for negative return values of temp_to_code()
from exynos_tmu_initialize().
The current level temperature data hardcoded in pdata will never
cause a negative temp_to_code() return values and checking itself
is not proper. The checks in question are done at runtime in
a production code for data that is hardcoded inside driver during
development time and later it doesn't change. Such data should
be verified during development and review time (i.e. by a script
parsing relevant data from exynos_tmu_data.c, one can also argue
that verification to be done is so simple that the review by
a maintainer should be enough).
Theres should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index b9bffad..15574cc 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -215,10 +215,6 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
if (data->soc == SOC_ARCH_EXYNOS4210) {
/* Write temperature code for threshold */
threshold_code = temp_to_code(data, pdata->threshold);
- if (threshold_code < 0) {
- ret = threshold_code;
- goto out;
- }
writeb(threshold_code,
data->base + reg->threshold_temp);
for (i = 0; i < trigger_levs; i++)
@@ -232,19 +228,13 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
i < trigger_levs && i < EXYNOS_MAX_TRIGGER_PER_REG; i++) {
threshold_code = temp_to_code(data,
pdata->trigger_levels[i]);
- if (threshold_code < 0) {
- ret = threshold_code;
- goto out;
- }
rising_threshold &= ~(0xff << 8 * i);
rising_threshold |= threshold_code << 8 * i;
if (pdata->threshold_falling) {
threshold_code = temp_to_code(data,
pdata->trigger_levels[i] -
pdata->threshold_falling);
- if (threshold_code > 0)
- falling_threshold |=
- threshold_code << 8 * i;
+ falling_threshold |= threshold_code << 8 * i;
}
}
@@ -263,10 +253,6 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
(pdata->trigger_type[i] == HW_TRIP)) {
threshold_code = temp_to_code(data,
pdata->trigger_levels[i]);
- if (threshold_code < 0) {
- ret = threshold_code;
- goto out;
- }
if (i == EXYNOS_MAX_TRIGGER_PER_REG - 1) {
/* 1-4 level to be assigned in th0 reg */
rising_threshold &= ~(0xff << 8 * i);
--
1.8.2.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 5/8] thermal: exynos: simplify temp_to_code() and code_to_temp()
2014-07-31 17:10 [PATCH v3 0/8] thermal: exynos: various cleanups Bartlomiej Zolnierkiewicz
` (3 preceding siblings ...)
2014-07-31 17:11 ` [PATCH v3 4/8] thermal: exynos: remove redundant threshold_code " Bartlomiej Zolnierkiewicz
@ 2014-07-31 17:11 ` Bartlomiej Zolnierkiewicz
2014-07-31 17:11 ` [PATCH v3 6/8] thermal: exynos: cache non_hw_trigger_levels in pdata Bartlomiej Zolnierkiewicz
` (3 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-07-31 17:11 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Zhang Rui, Amit Daniel Kachhap, Tomasz Figa, Rafael J. Wysocki,
Kyungmin Park, linux-samsung-soc, linux-pm, linux-kernel,
b.zolnierkie
* Remove dead temp check from temp_to_code() (this function users
in exynos_tmu_initialize() always pass correct temperatures and
exynos_tmu_set_emulation() returns early for EXYNOS4210 because
TMU_SUPPORT_EMULATION flag is not set on this SoC).
* Move temp_code check from code_to_temp() to exynos_tmu_read()
(code_to_temp() only user).
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.c | 28 +++++++++++-----------------
1 file changed, 11 insertions(+), 17 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 15574cc..aa4d4fd 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -77,13 +77,6 @@ static int temp_to_code(struct exynos_tmu_data *data, u8 temp)
struct exynos_tmu_platform_data *pdata = data->pdata;
int temp_code;
- if (data->soc == SOC_ARCH_EXYNOS4210)
- /* temp should range between 25 and 125 */
- if (temp < 25 || temp > 125) {
- temp_code = -EINVAL;
- goto out;
- }
-
switch (pdata->cal_type) {
case TYPE_TWO_POINT_TRIMMING:
temp_code = (temp - pdata->first_point_trim) *
@@ -98,7 +91,7 @@ static int temp_to_code(struct exynos_tmu_data *data, u8 temp)
temp_code = temp + pdata->default_temp_offset;
break;
}
-out:
+
return temp_code;
}
@@ -111,13 +104,6 @@ static int code_to_temp(struct exynos_tmu_data *data, u8 temp_code)
struct exynos_tmu_platform_data *pdata = data->pdata;
int temp;
- if (data->soc == SOC_ARCH_EXYNOS4210)
- /* temp_code should range between 75 and 175 */
- if (temp_code < 75 || temp_code > 175) {
- temp = -ENODATA;
- goto out;
- }
-
switch (pdata->cal_type) {
case TYPE_TWO_POINT_TRIMMING:
temp = (temp_code - data->temp_error1) *
@@ -132,7 +118,7 @@ static int code_to_temp(struct exynos_tmu_data *data, u8 temp_code)
temp = temp_code - pdata->default_temp_offset;
break;
}
-out:
+
return temp;
}
@@ -346,8 +332,16 @@ static int exynos_tmu_read(struct exynos_tmu_data *data)
clk_enable(data->clk);
temp_code = readb(data->base + reg->tmu_cur_temp);
- temp = code_to_temp(data, temp_code);
+ if (data->soc == SOC_ARCH_EXYNOS4210)
+ /* temp_code should range between 75 and 175 */
+ if (temp_code < 75 || temp_code > 175) {
+ temp = -ENODATA;
+ goto out;
+ }
+
+ temp = code_to_temp(data, temp_code);
+out:
clk_disable(data->clk);
mutex_unlock(&data->lock);
--
1.8.2.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 6/8] thermal: exynos: cache non_hw_trigger_levels in pdata
2014-07-31 17:10 [PATCH v3 0/8] thermal: exynos: various cleanups Bartlomiej Zolnierkiewicz
` (4 preceding siblings ...)
2014-07-31 17:11 ` [PATCH v3 5/8] thermal: exynos: simplify temp_to_code() and code_to_temp() Bartlomiej Zolnierkiewicz
@ 2014-07-31 17:11 ` Bartlomiej Zolnierkiewicz
2014-07-31 17:11 ` [PATCH v3 7/8] thermal: exynos: remove redundant pdata checks from exynos_tmu_control() Bartlomiej Zolnierkiewicz
` (2 subsequent siblings)
8 siblings, 0 replies; 16+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-07-31 17:11 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Zhang Rui, Amit Daniel Kachhap, Tomasz Figa, Rafael J. Wysocki,
Kyungmin Park, linux-samsung-soc, linux-pm, linux-kernel,
b.zolnierkie
Cache number of non-hardware trigger levels in a new pdata field
(non_hw_trigger_levels) and convert code in exynos_tmu_initialize()
accordingly.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.c | 16 +++-------------
drivers/thermal/samsung/exynos_tmu.h | 2 ++
drivers/thermal/samsung/exynos_tmu_data.c | 6 ++++++
3 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index aa4d4fd..6bc8a20 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -129,7 +129,7 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
const struct exynos_tmu_registers *reg = pdata->registers;
unsigned int status, trim_info = 0, con;
unsigned int rising_threshold = 0, falling_threshold = 0;
- int ret = 0, threshold_code, i, trigger_levs = 0;
+ int ret = 0, threshold_code, i;
mutex_lock(&data->lock);
clk_enable(data->clk);
@@ -187,15 +187,6 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
(pdata->efuse_value >> reg->triminfo_85_shift) &
EXYNOS_TMU_TEMP_MASK;
- for (i = 0; i < pdata->max_trigger_level; i++) {
- if (!pdata->trigger_levels[i])
- continue;
-
- /* Count trigger levels except the HW trip*/
- if (!(pdata->trigger_type[i] == HW_TRIP))
- trigger_levs++;
- }
-
rising_threshold = readl(data->base + reg->threshold_th0);
if (data->soc == SOC_ARCH_EXYNOS4210) {
@@ -203,15 +194,14 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
threshold_code = temp_to_code(data, pdata->threshold);
writeb(threshold_code,
data->base + reg->threshold_temp);
- for (i = 0; i < trigger_levs; i++)
+ for (i = 0; i < pdata->non_hw_trigger_levels; i++)
writeb(pdata->trigger_levels[i], data->base +
reg->threshold_th0 + i * sizeof(reg->threshold_th0));
writel(reg->intclr_rise_mask, data->base + reg->tmu_intclear);
} else {
/* Write temperature code for rising and falling threshold */
- for (i = 0;
- i < trigger_levs && i < EXYNOS_MAX_TRIGGER_PER_REG; i++) {
+ for (i = 0; i < pdata->non_hw_trigger_levels; i++) {
threshold_code = temp_to_code(data,
pdata->trigger_levels[i]);
rising_threshold &= ~(0xff << 8 * i);
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
index 789a8f7..5514d68 100644
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -199,6 +199,7 @@ struct exynos_tmu_registers {
* 1 = enable trigger_level[] interrupt,
* 0 = disable trigger_level[] interrupt
* @max_trigger_level: max trigger level supported by the TMU
+ * @non_hw_trigger_levels: number of defined non-hardware trigger levels
* @gain: gain of amplifier in the positive-TC generator block
* 0 <= gain <= 15
* @reference_voltage: reference voltage of amplifier
@@ -232,6 +233,7 @@ struct exynos_tmu_platform_data {
enum trigger_type trigger_type[MAX_TRIP_COUNT];
bool trigger_enable[MAX_TRIP_COUNT];
u8 max_trigger_level;
+ u8 non_hw_trigger_levels;
u8 gain;
u8 reference_voltage;
u8 noise_cancel_mode;
diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
index 1d05bf8..9c81515 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.c
+++ b/drivers/thermal/samsung/exynos_tmu_data.c
@@ -64,6 +64,7 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
.trigger_type[1] = THROTTLE_ACTIVE,
.trigger_type[2] = SW_TRIP,
.max_trigger_level = 4,
+ .non_hw_trigger_levels = 3,
.gain = 15,
.reference_voltage = 7,
.cal_type = TYPE_ONE_POINT_TRIMMING,
@@ -140,6 +141,7 @@ static const struct exynos_tmu_registers exynos3250_tmu_registers = {
.trigger_type[2] = SW_TRIP, \
.trigger_type[3] = HW_TRIP, \
.max_trigger_level = 4, \
+ .non_hw_trigger_levels = 3, \
.gain = 8, \
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
@@ -230,6 +232,7 @@ static const struct exynos_tmu_registers exynos4412_tmu_registers = {
.trigger_type[2] = SW_TRIP, \
.trigger_type[3] = HW_TRIP, \
.max_trigger_level = 4, \
+ .non_hw_trigger_levels = 3, \
.gain = 8, \
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
@@ -331,6 +334,7 @@ static const struct exynos_tmu_registers exynos5260_tmu_registers = {
.trigger_type[2] = SW_TRIP, \
.trigger_type[3] = HW_TRIP, \
.max_trigger_level = 4, \
+ .non_hw_trigger_levels = 3, \
.gain = 8, \
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
@@ -422,6 +426,7 @@ static const struct exynos_tmu_registers exynos5420_tmu_registers = {
.trigger_type[2] = SW_TRIP, \
.trigger_type[3] = HW_TRIP, \
.max_trigger_level = 4, \
+ .non_hw_trigger_levels = 3, \
.gain = 8, \
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
@@ -514,6 +519,7 @@ static const struct exynos_tmu_registers exynos5440_tmu_registers = {
.trigger_type[0] = SW_TRIP, \
.trigger_type[4] = HW_TRIP, \
.max_trigger_level = 5, \
+ .non_hw_trigger_levels = 1, \
.gain = 5, \
.reference_voltage = 16, \
.noise_cancel_mode = 4, \
--
1.8.2.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 7/8] thermal: exynos: remove redundant pdata checks from exynos_tmu_control()
2014-07-31 17:10 [PATCH v3 0/8] thermal: exynos: various cleanups Bartlomiej Zolnierkiewicz
` (5 preceding siblings ...)
2014-07-31 17:11 ` [PATCH v3 6/8] thermal: exynos: cache non_hw_trigger_levels in pdata Bartlomiej Zolnierkiewicz
@ 2014-07-31 17:11 ` Bartlomiej Zolnierkiewicz
2014-07-31 17:11 ` [PATCH v3 8/8] thermal: exynos: remove identical values from exynos*_tmu_registers structures Bartlomiej Zolnierkiewicz
2014-08-28 14:49 ` [PATCH v3 0/8] thermal: exynos: various cleanups Eduardo Valentin
8 siblings, 0 replies; 16+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-07-31 17:11 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Zhang Rui, Amit Daniel Kachhap, Tomasz Figa, Rafael J. Wysocki,
Kyungmin Park, linux-samsung-soc, linux-pm, linux-kernel,
b.zolnierkie
pdata->reference_voltage and pdata->gain are always defined
to non-zero values so remove the redundant checks from
exynos_tmu_control().
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.c | 12 ++++--------
drivers/thermal/samsung/exynos_tmu.h | 4 ++--
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 6bc8a20..122ae66 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -274,15 +274,11 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
if (pdata->test_mux)
con |= (pdata->test_mux << reg->test_mux_addr_shift);
- if (pdata->reference_voltage) {
- con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift);
- con |= pdata->reference_voltage << reg->buf_vref_sel_shift;
- }
+ con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift);
+ con |= pdata->reference_voltage << reg->buf_vref_sel_shift;
- if (pdata->gain) {
- con &= ~(reg->buf_slope_sel_mask << reg->buf_slope_sel_shift);
- con |= (pdata->gain << reg->buf_slope_sel_shift);
- }
+ con &= ~(reg->buf_slope_sel_mask << reg->buf_slope_sel_shift);
+ con |= (pdata->gain << reg->buf_slope_sel_shift);
if (pdata->noise_cancel_mode) {
con &= ~(reg->therm_trip_mode_mask <<
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
index 5514d68..327c64f 100644
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -201,10 +201,10 @@ struct exynos_tmu_registers {
* @max_trigger_level: max trigger level supported by the TMU
* @non_hw_trigger_levels: number of defined non-hardware trigger levels
* @gain: gain of amplifier in the positive-TC generator block
- * 0 <= gain <= 15
+ * 0 < gain <= 15
* @reference_voltage: reference voltage of amplifier
* in the positive-TC generator block
- * 0 <= reference_voltage <= 31
+ * 0 < reference_voltage <= 31
* @noise_cancel_mode: noise cancellation mode
* 000, 100, 101, 110 and 111 can be different modes
* @type: determines the type of SOC
--
1.8.2.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH v3 8/8] thermal: exynos: remove identical values from exynos*_tmu_registers structures
2014-07-31 17:10 [PATCH v3 0/8] thermal: exynos: various cleanups Bartlomiej Zolnierkiewicz
` (6 preceding siblings ...)
2014-07-31 17:11 ` [PATCH v3 7/8] thermal: exynos: remove redundant pdata checks from exynos_tmu_control() Bartlomiej Zolnierkiewicz
@ 2014-07-31 17:11 ` Bartlomiej Zolnierkiewicz
2014-08-28 14:49 ` [PATCH v3 0/8] thermal: exynos: various cleanups Eduardo Valentin
8 siblings, 0 replies; 16+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2014-07-31 17:11 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Zhang Rui, Amit Daniel Kachhap, Tomasz Figa, Rafael J. Wysocki,
Kyungmin Park, linux-samsung-soc, linux-pm, linux-kernel,
b.zolnierkie
There is no need for abstracting configuration for registers that
are identical on all SoC types.
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/thermal/samsung/exynos_tmu.c | 16 ++++++------
drivers/thermal/samsung/exynos_tmu.h | 15 -----------
drivers/thermal/samsung/exynos_tmu_data.c | 42 -------------------------------
3 files changed, 8 insertions(+), 65 deletions(-)
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index 122ae66..35437df 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -174,7 +174,7 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
trim_info = readl(data->base + reg->triminfo_data);
}
data->temp_error1 = trim_info & EXYNOS_TMU_TEMP_MASK;
- data->temp_error2 = ((trim_info >> reg->triminfo_85_shift) &
+ data->temp_error2 = ((trim_info >> EXYNOS_TRIMINFO_85_SHIFT) &
EXYNOS_TMU_TEMP_MASK);
if (!data->temp_error1 ||
@@ -184,7 +184,7 @@ static int exynos_tmu_initialize(struct platform_device *pdev)
if (!data->temp_error2)
data->temp_error2 =
- (pdata->efuse_value >> reg->triminfo_85_shift) &
+ (pdata->efuse_value >> EXYNOS_TRIMINFO_85_SHIFT) &
EXYNOS_TMU_TEMP_MASK;
rising_threshold = readl(data->base + reg->threshold_th0);
@@ -274,11 +274,11 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
if (pdata->test_mux)
con |= (pdata->test_mux << reg->test_mux_addr_shift);
- con &= ~(reg->buf_vref_sel_mask << reg->buf_vref_sel_shift);
- con |= pdata->reference_voltage << reg->buf_vref_sel_shift;
+ con &= ~(EXYNOS_TMU_REF_VOLTAGE_MASK << EXYNOS_TMU_REF_VOLTAGE_SHIFT);
+ con |= pdata->reference_voltage << EXYNOS_TMU_REF_VOLTAGE_SHIFT;
- con &= ~(reg->buf_slope_sel_mask << reg->buf_slope_sel_shift);
- con |= (pdata->gain << reg->buf_slope_sel_shift);
+ con &= ~(EXYNOS_TMU_BUF_SLOPE_SEL_MASK << EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT);
+ con |= (pdata->gain << EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT);
if (pdata->noise_cancel_mode) {
con &= ~(reg->therm_trip_mode_mask <<
@@ -287,7 +287,7 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
}
if (on) {
- con |= (1 << reg->core_en_shift);
+ con |= (1 << EXYNOS_TMU_CORE_EN_SHIFT);
interrupt_en =
pdata->trigger_enable[3] << reg->inten_rise3_shift |
pdata->trigger_enable[2] << reg->inten_rise2_shift |
@@ -297,7 +297,7 @@ static void exynos_tmu_control(struct platform_device *pdev, bool on)
interrupt_en |=
interrupt_en << reg->inten_fall0_shift;
} else {
- con &= ~(1 << reg->core_en_shift);
+ con &= ~(1 << EXYNOS_TMU_CORE_EN_SHIFT);
interrupt_en = 0; /* Disable all interrupts */
}
writel(interrupt_en, data->base + reg->tmu_inten);
diff --git a/drivers/thermal/samsung/exynos_tmu.h b/drivers/thermal/samsung/exynos_tmu.h
index 327c64f..d503f35 100644
--- a/drivers/thermal/samsung/exynos_tmu.h
+++ b/drivers/thermal/samsung/exynos_tmu.h
@@ -77,20 +77,12 @@ enum soc_type {
* bitfields. The register validity, offsets and bitfield values may vary
* slightly across different exynos SOC's.
* @triminfo_data: register containing 2 pont trimming data
- * @triminfo_25_shift: shift bit of the 25 C trim value in triminfo_data reg.
- * @triminfo_85_shift: shift bit of the 85 C trim value in triminfo_data reg.
* @triminfo_ctrl: trim info controller register.
* @tmu_ctrl: TMU main controller register.
* @test_mux_addr_shift: shift bits of test mux address.
- * @buf_vref_sel_shift: shift bits of reference voltage in tmu_ctrl register.
- * @buf_vref_sel_mask: mask bits of reference voltage in tmu_ctrl register.
* @therm_trip_mode_shift: shift bits of tripping mode in tmu_ctrl register.
* @therm_trip_mode_mask: mask bits of tripping mode in tmu_ctrl register.
* @therm_trip_en_shift: shift bits of tripping enable in tmu_ctrl register.
- * @buf_slope_sel_shift: shift bits of amplifier gain value in tmu_ctrl
- register.
- * @buf_slope_sel_mask: mask bits of amplifier gain value in tmu_ctrl register.
- * @core_en_shift: shift bits of TMU core enable bit in tmu_ctrl register.
* @tmu_status: register drescribing the TMU status.
* @tmu_cur_temp: register containing the current temperature of the TMU.
* @threshold_temp: register containing the base threshold level.
@@ -119,22 +111,15 @@ enum soc_type {
*/
struct exynos_tmu_registers {
u32 triminfo_data;
- u32 triminfo_25_shift;
- u32 triminfo_85_shift;
u32 triminfo_ctrl;
u32 triminfo_ctrl1;
u32 tmu_ctrl;
u32 test_mux_addr_shift;
- u32 buf_vref_sel_shift;
- u32 buf_vref_sel_mask;
u32 therm_trip_mode_shift;
u32 therm_trip_mode_mask;
u32 therm_trip_en_shift;
- u32 buf_slope_sel_shift;
- u32 buf_slope_sel_mask;
- u32 core_en_shift;
u32 tmu_status;
diff --git a/drivers/thermal/samsung/exynos_tmu_data.c b/drivers/thermal/samsung/exynos_tmu_data.c
index 9c81515..82e0732 100644
--- a/drivers/thermal/samsung/exynos_tmu_data.c
+++ b/drivers/thermal/samsung/exynos_tmu_data.c
@@ -27,14 +27,7 @@
#if defined(CONFIG_CPU_EXYNOS4210)
static const struct exynos_tmu_registers exynos4210_tmu_registers = {
.triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
- .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
- .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
- .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
- .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
- .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
- .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
- .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
.tmu_status = EXYNOS_TMU_REG_STATUS,
.tmu_cur_temp = EXYNOS_TMU_REG_CURRENT_TEMP,
.threshold_temp = EXYNOS4210_TMU_REG_THRESHOLD_TEMP,
@@ -94,18 +87,11 @@ struct exynos_tmu_init_data const exynos4210_default_tmu_data = {
#if defined(CONFIG_SOC_EXYNOS3250)
static const struct exynos_tmu_registers exynos3250_tmu_registers = {
.triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
- .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
- .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
- .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
- .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
.therm_trip_mode_mask = EXYNOS_TMU_TRIP_MODE_MASK,
.therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
- .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
- .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
- .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
.tmu_status = EXYNOS_TMU_REG_STATUS,
.tmu_cur_temp = EXYNOS_TMU_REG_CURRENT_TEMP,
.threshold_th0 = EXYNOS_THD_TEMP_RISE,
@@ -183,19 +169,12 @@ struct exynos_tmu_init_data const exynos3250_default_tmu_data = {
#if defined(CONFIG_SOC_EXYNOS4412) || defined(CONFIG_SOC_EXYNOS5250)
static const struct exynos_tmu_registers exynos4412_tmu_registers = {
.triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
- .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
- .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
.triminfo_ctrl = EXYNOS_TMU_TRIMINFO_CON,
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
.test_mux_addr_shift = EXYNOS4412_MUX_ADDR_SHIFT,
- .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
- .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
.therm_trip_mode_mask = EXYNOS_TMU_TRIP_MODE_MASK,
.therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
- .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
- .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
- .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
.tmu_status = EXYNOS_TMU_REG_STATUS,
.tmu_cur_temp = EXYNOS_TMU_REG_CURRENT_TEMP,
.threshold_th0 = EXYNOS_THD_TEMP_RISE,
@@ -286,18 +265,11 @@ struct exynos_tmu_init_data const exynos5250_default_tmu_data = {
#if defined(CONFIG_SOC_EXYNOS5260)
static const struct exynos_tmu_registers exynos5260_tmu_registers = {
.triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
- .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
- .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL1,
- .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
- .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
.therm_trip_mode_mask = EXYNOS_TMU_TRIP_MODE_MASK,
.therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
- .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
- .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
- .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
.tmu_status = EXYNOS_TMU_REG_STATUS,
.tmu_cur_temp = EXYNOS_TMU_REG_CURRENT_TEMP,
.threshold_th0 = EXYNOS_THD_TEMP_RISE,
@@ -378,17 +350,10 @@ struct exynos_tmu_init_data const exynos5260_default_tmu_data = {
#if defined(CONFIG_SOC_EXYNOS5420)
static const struct exynos_tmu_registers exynos5420_tmu_registers = {
.triminfo_data = EXYNOS_TMU_REG_TRIMINFO,
- .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
- .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
.tmu_ctrl = EXYNOS_TMU_REG_CONTROL,
- .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
- .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
.therm_trip_mode_mask = EXYNOS_TMU_TRIP_MODE_MASK,
.therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
- .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
- .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
- .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
.tmu_status = EXYNOS_TMU_REG_STATUS,
.tmu_cur_temp = EXYNOS_TMU_REG_CURRENT_TEMP,
.threshold_th0 = EXYNOS_THD_TEMP_RISE,
@@ -477,17 +442,10 @@ struct exynos_tmu_init_data const exynos5420_default_tmu_data = {
#if defined(CONFIG_SOC_EXYNOS5440)
static const struct exynos_tmu_registers exynos5440_tmu_registers = {
.triminfo_data = EXYNOS5440_TMU_S0_7_TRIM,
- .triminfo_25_shift = EXYNOS_TRIMINFO_25_SHIFT,
- .triminfo_85_shift = EXYNOS_TRIMINFO_85_SHIFT,
.tmu_ctrl = EXYNOS5440_TMU_S0_7_CTRL,
- .buf_vref_sel_shift = EXYNOS_TMU_REF_VOLTAGE_SHIFT,
- .buf_vref_sel_mask = EXYNOS_TMU_REF_VOLTAGE_MASK,
.therm_trip_mode_shift = EXYNOS_TMU_TRIP_MODE_SHIFT,
.therm_trip_mode_mask = EXYNOS_TMU_TRIP_MODE_MASK,
.therm_trip_en_shift = EXYNOS_TMU_THERM_TRIP_EN_SHIFT,
- .buf_slope_sel_shift = EXYNOS_TMU_BUF_SLOPE_SEL_SHIFT,
- .buf_slope_sel_mask = EXYNOS_TMU_BUF_SLOPE_SEL_MASK,
- .core_en_shift = EXYNOS_TMU_CORE_EN_SHIFT,
.tmu_status = EXYNOS5440_TMU_S0_7_STATUS,
.tmu_cur_temp = EXYNOS5440_TMU_S0_7_TEMP,
.threshold_th0 = EXYNOS5440_TMU_S0_7_TH0,
--
1.8.2.3
^ permalink raw reply related [flat|nested] 16+ messages in thread* Re: [PATCH v3 0/8] thermal: exynos: various cleanups
2014-07-31 17:10 [PATCH v3 0/8] thermal: exynos: various cleanups Bartlomiej Zolnierkiewicz
` (7 preceding siblings ...)
2014-07-31 17:11 ` [PATCH v3 8/8] thermal: exynos: remove identical values from exynos*_tmu_registers structures Bartlomiej Zolnierkiewicz
@ 2014-08-28 14:49 ` Eduardo Valentin
2014-09-01 10:53 ` amit daniel kachhap
8 siblings, 1 reply; 16+ messages in thread
From: Eduardo Valentin @ 2014-08-28 14:49 UTC (permalink / raw)
To: Bartlomiej Zolnierkiewicz
Cc: Eduardo Valentin, Zhang Rui, Amit Daniel Kachhap, Tomasz Figa,
Rafael J. Wysocki, Kyungmin Park, linux-samsung-soc, linux-pm,
linux-kernel
Amit,
On Thu, Jul 31, 2014 at 07:10:58PM +0200, Bartlomiej Zolnierkiewicz wrote:
> Hi,
>
> This patch series contains various cleanups for EXYNOS thermal
> driver. Overall it decreases driver's LOC by 9%. It is based
> on next-20140731 kernel. It should not cause any functionality
> changes.
>
Did you have the time to test this series?
> Changes since v2 (https://lkml.org/lkml/2014/6/17/436):
> - synced patches against next-20140731
> - dropped patch "thermal: exynos: remove dead code for
> TYPE_TWO_POINT_TRIMMING calibration" (newly added Exynos3250
> SoC support uses TYPE_TWO_POINT_TRIMMING calibration)
> - updated patch description for patch #2
> - dropped Reviewed-by from Amit from patch #8 (due to changed
> scope of the patch)
>
> Changes since v1 (https://lkml.org/lkml/2014/5/5/194):
> - synced patches against next-20140617
> - merged patch "thermal: exynos: remove unused defines" into
> "thermal: exynos: remove unused struct exynos_tmu_registers
> entries" one (per request from Eduardo)
> - improved patch descriptions for patches #1-5
> - fixed documentation for pdata->gain and pdata->reference_voltage
> - added Reviewed-by from Amit to patches #6, #7 and #10
> - added missing Acked-by from Kyungmin Park
>
> Best regards,
> --
> Bartlomiej Zolnierkiewicz
> Samsung R&D Institute Poland
> Samsung Electronics
>
>
> Bartlomiej Zolnierkiewicz (8):
> thermal: exynos: remove unused struct exynos_tmu_registers entries
> thermal: exynos: remove dead code for HW_MODE calibration
> thermal: exynos: remove redundant pdata checks from
> exynos_tmu_initialize()
> thermal: exynos: remove redundant threshold_code checks from
> exynos_tmu_initialize()
> thermal: exynos: simplify temp_to_code() and code_to_temp()
> thermal: exynos: cache non_hw_trigger_levels in pdata
> thermal: exynos: remove redundant pdata checks from
> exynos_tmu_control()
> thermal: exynos: remove identical values from exynos*_tmu_registers
> structures
>
> drivers/thermal/samsung/exynos_thermal_common.h | 1 -
> drivers/thermal/samsung/exynos_tmu.c | 126 +++++-------------------
> drivers/thermal/samsung/exynos_tmu.h | 74 +-------------
> drivers/thermal/samsung/exynos_tmu_data.c | 56 ++---------
> drivers/thermal/samsung/exynos_tmu_data.h | 31 +-----
> 5 files changed, 35 insertions(+), 253 deletions(-)
>
> --
> 1.8.2.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH v3 0/8] thermal: exynos: various cleanups
2014-08-28 14:49 ` [PATCH v3 0/8] thermal: exynos: various cleanups Eduardo Valentin
@ 2014-09-01 10:53 ` amit daniel kachhap
0 siblings, 0 replies; 16+ messages in thread
From: amit daniel kachhap @ 2014-09-01 10:53 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Bartlomiej Zolnierkiewicz, Eduardo Valentin, Zhang Rui,
Tomasz Figa, Rafael J. Wysocki, Kyungmin Park, linux-samsung-soc,
linux-pm, linux-kernel
On Thu, Aug 28, 2014 at 8:19 PM, Eduardo Valentin <edubezval@gmail.com> wrote:
> Amit,
>
> On Thu, Jul 31, 2014 at 07:10:58PM +0200, Bartlomiej Zolnierkiewicz wrote:
>> Hi,
>>
>> This patch series contains various cleanups for EXYNOS thermal
>> driver. Overall it decreases driver's LOC by 9%. It is based
>> on next-20140731 kernel. It should not cause any functionality
>> changes.
>>
>
> Did you have the time to test this series?
Hi Eduardo/Bartlomiej,
For the whole series tested on exynos5250 based arndale board.
Tested-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Sorry for the delay as I was busy in some internal work.
Thanks,
Amit D
>
>> Changes since v2 (https://lkml.org/lkml/2014/6/17/436):
>> - synced patches against next-20140731
>> - dropped patch "thermal: exynos: remove dead code for
>> TYPE_TWO_POINT_TRIMMING calibration" (newly added Exynos3250
>> SoC support uses TYPE_TWO_POINT_TRIMMING calibration)
>> - updated patch description for patch #2
>> - dropped Reviewed-by from Amit from patch #8 (due to changed
>> scope of the patch)
>>
>> Changes since v1 (https://lkml.org/lkml/2014/5/5/194):
>> - synced patches against next-20140617
>> - merged patch "thermal: exynos: remove unused defines" into
>> "thermal: exynos: remove unused struct exynos_tmu_registers
>> entries" one (per request from Eduardo)
>> - improved patch descriptions for patches #1-5
>> - fixed documentation for pdata->gain and pdata->reference_voltage
>> - added Reviewed-by from Amit to patches #6, #7 and #10
>> - added missing Acked-by from Kyungmin Park
>>
>> Best regards,
>> --
>> Bartlomiej Zolnierkiewicz
>> Samsung R&D Institute Poland
>> Samsung Electronics
>>
>>
>> Bartlomiej Zolnierkiewicz (8):
>> thermal: exynos: remove unused struct exynos_tmu_registers entries
>> thermal: exynos: remove dead code for HW_MODE calibration
>> thermal: exynos: remove redundant pdata checks from
>> exynos_tmu_initialize()
>> thermal: exynos: remove redundant threshold_code checks from
>> exynos_tmu_initialize()
>> thermal: exynos: simplify temp_to_code() and code_to_temp()
>> thermal: exynos: cache non_hw_trigger_levels in pdata
>> thermal: exynos: remove redundant pdata checks from
>> exynos_tmu_control()
>> thermal: exynos: remove identical values from exynos*_tmu_registers
>> structures
>>
>> drivers/thermal/samsung/exynos_thermal_common.h | 1 -
>> drivers/thermal/samsung/exynos_tmu.c | 126 +++++-------------------
>> drivers/thermal/samsung/exynos_tmu.h | 74 +-------------
>> drivers/thermal/samsung/exynos_tmu_data.c | 56 ++---------
>> drivers/thermal/samsung/exynos_tmu_data.h | 31 +-----
>> 5 files changed, 35 insertions(+), 253 deletions(-)
>>
>> --
>> 1.8.2.3
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 0/8] thermal: exynos: various cleanups
@ 2014-09-01 10:53 ` amit daniel kachhap
0 siblings, 0 replies; 16+ messages in thread
From: amit daniel kachhap @ 2014-09-01 10:53 UTC (permalink / raw)
To: Eduardo Valentin
Cc: Bartlomiej Zolnierkiewicz, Eduardo Valentin, Zhang Rui,
Tomasz Figa, Rafael J. Wysocki, Kyungmin Park, linux-samsung-soc,
linux-pm, linux-kernel
On Thu, Aug 28, 2014 at 8:19 PM, Eduardo Valentin <edubezval@gmail.com> wrote:
> Amit,
>
> On Thu, Jul 31, 2014 at 07:10:58PM +0200, Bartlomiej Zolnierkiewicz wrote:
>> Hi,
>>
>> This patch series contains various cleanups for EXYNOS thermal
>> driver. Overall it decreases driver's LOC by 9%. It is based
>> on next-20140731 kernel. It should not cause any functionality
>> changes.
>>
>
> Did you have the time to test this series?
Hi Eduardo/Bartlomiej,
For the whole series tested on exynos5250 based arndale board.
Tested-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Sorry for the delay as I was busy in some internal work.
Thanks,
Amit D
>
>> Changes since v2 (https://lkml.org/lkml/2014/6/17/436):
>> - synced patches against next-20140731
>> - dropped patch "thermal: exynos: remove dead code for
>> TYPE_TWO_POINT_TRIMMING calibration" (newly added Exynos3250
>> SoC support uses TYPE_TWO_POINT_TRIMMING calibration)
>> - updated patch description for patch #2
>> - dropped Reviewed-by from Amit from patch #8 (due to changed
>> scope of the patch)
>>
>> Changes since v1 (https://lkml.org/lkml/2014/5/5/194):
>> - synced patches against next-20140617
>> - merged patch "thermal: exynos: remove unused defines" into
>> "thermal: exynos: remove unused struct exynos_tmu_registers
>> entries" one (per request from Eduardo)
>> - improved patch descriptions for patches #1-5
>> - fixed documentation for pdata->gain and pdata->reference_voltage
>> - added Reviewed-by from Amit to patches #6, #7 and #10
>> - added missing Acked-by from Kyungmin Park
>>
>> Best regards,
>> --
>> Bartlomiej Zolnierkiewicz
>> Samsung R&D Institute Poland
>> Samsung Electronics
>>
>>
>> Bartlomiej Zolnierkiewicz (8):
>> thermal: exynos: remove unused struct exynos_tmu_registers entries
>> thermal: exynos: remove dead code for HW_MODE calibration
>> thermal: exynos: remove redundant pdata checks from
>> exynos_tmu_initialize()
>> thermal: exynos: remove redundant threshold_code checks from
>> exynos_tmu_initialize()
>> thermal: exynos: simplify temp_to_code() and code_to_temp()
>> thermal: exynos: cache non_hw_trigger_levels in pdata
>> thermal: exynos: remove redundant pdata checks from
>> exynos_tmu_control()
>> thermal: exynos: remove identical values from exynos*_tmu_registers
>> structures
>>
>> drivers/thermal/samsung/exynos_thermal_common.h | 1 -
>> drivers/thermal/samsung/exynos_tmu.c | 126 +++++-------------------
>> drivers/thermal/samsung/exynos_tmu.h | 74 +-------------
>> drivers/thermal/samsung/exynos_tmu_data.c | 56 ++---------
>> drivers/thermal/samsung/exynos_tmu_data.h | 31 +-----
>> 5 files changed, 35 insertions(+), 253 deletions(-)
>>
>> --
>> 1.8.2.3
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 0/8] thermal: exynos: various cleanups
2014-09-01 10:53 ` amit daniel kachhap
@ 2014-09-01 11:05 ` edubezval
-1 siblings, 0 replies; 16+ messages in thread
From: edubezval @ 2014-09-01 11:05 UTC (permalink / raw)
To: amit daniel kachhap
Cc: Bartlomiej Zolnierkiewicz, Eduardo Valentin, Zhang Rui,
Tomasz Figa, Rafael J. Wysocki, Kyungmin Park, linux-samsung-soc,
linux-pm, linux-kernel
Amit
On Mon, Sep 1, 2014 at 6:53 AM, amit daniel kachhap
<amit.daniel@samsung.com> wrote:
> On Thu, Aug 28, 2014 at 8:19 PM, Eduardo Valentin <edubezval@gmail.com> wrote:
>> Amit,
>>
>> On Thu, Jul 31, 2014 at 07:10:58PM +0200, Bartlomiej Zolnierkiewicz wrote:
>>> Hi,
>>>
>>> This patch series contains various cleanups for EXYNOS thermal
>>> driver. Overall it decreases driver's LOC by 9%. It is based
>>> on next-20140731 kernel. It should not cause any functionality
>>> changes.
>>>
>>
>> Did you have the time to test this series?
>
> Hi Eduardo/Bartlomiej,
>
> For the whole series tested on exynos5250 based arndale board.
> Tested-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
>
Thanks! I will pull the series on my tree.
> Sorry for the delay as I was busy in some internal work.
>
> Thanks,
> Amit D
>>
>>> Changes since v2 (https://lkml.org/lkml/2014/6/17/436):
>>> - synced patches against next-20140731
>>> - dropped patch "thermal: exynos: remove dead code for
>>> TYPE_TWO_POINT_TRIMMING calibration" (newly added Exynos3250
>>> SoC support uses TYPE_TWO_POINT_TRIMMING calibration)
>>> - updated patch description for patch #2
>>> - dropped Reviewed-by from Amit from patch #8 (due to changed
>>> scope of the patch)
>>>
>>> Changes since v1 (https://lkml.org/lkml/2014/5/5/194):
>>> - synced patches against next-20140617
>>> - merged patch "thermal: exynos: remove unused defines" into
>>> "thermal: exynos: remove unused struct exynos_tmu_registers
>>> entries" one (per request from Eduardo)
>>> - improved patch descriptions for patches #1-5
>>> - fixed documentation for pdata->gain and pdata->reference_voltage
>>> - added Reviewed-by from Amit to patches #6, #7 and #10
>>> - added missing Acked-by from Kyungmin Park
>>>
>>> Best regards,
>>> --
>>> Bartlomiej Zolnierkiewicz
>>> Samsung R&D Institute Poland
>>> Samsung Electronics
>>>
>>>
>>> Bartlomiej Zolnierkiewicz (8):
>>> thermal: exynos: remove unused struct exynos_tmu_registers entries
>>> thermal: exynos: remove dead code for HW_MODE calibration
>>> thermal: exynos: remove redundant pdata checks from
>>> exynos_tmu_initialize()
>>> thermal: exynos: remove redundant threshold_code checks from
>>> exynos_tmu_initialize()
>>> thermal: exynos: simplify temp_to_code() and code_to_temp()
>>> thermal: exynos: cache non_hw_trigger_levels in pdata
>>> thermal: exynos: remove redundant pdata checks from
>>> exynos_tmu_control()
>>> thermal: exynos: remove identical values from exynos*_tmu_registers
>>> structures
>>>
>>> drivers/thermal/samsung/exynos_thermal_common.h | 1 -
>>> drivers/thermal/samsung/exynos_tmu.c | 126 +++++-------------------
>>> drivers/thermal/samsung/exynos_tmu.h | 74 +-------------
>>> drivers/thermal/samsung/exynos_tmu_data.c | 56 ++---------
>>> drivers/thermal/samsung/exynos_tmu_data.h | 31 +-----
>>> 5 files changed, 35 insertions(+), 253 deletions(-)
>>>
>>> --
>>> 1.8.2.3
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Eduardo Bezerra Valentin
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 0/8] thermal: exynos: various cleanups
@ 2014-09-01 11:05 ` edubezval
0 siblings, 0 replies; 16+ messages in thread
From: edubezval @ 2014-09-01 11:05 UTC (permalink / raw)
To: amit daniel kachhap
Cc: Bartlomiej Zolnierkiewicz, Eduardo Valentin, Zhang Rui,
Tomasz Figa, Rafael J. Wysocki, Kyungmin Park, linux-samsung-soc,
linux-pm, linux-kernel
Amit
On Mon, Sep 1, 2014 at 6:53 AM, amit daniel kachhap
<amit.daniel@samsung.com> wrote:
> On Thu, Aug 28, 2014 at 8:19 PM, Eduardo Valentin <edubezval@gmail.com> wrote:
>> Amit,
>>
>> On Thu, Jul 31, 2014 at 07:10:58PM +0200, Bartlomiej Zolnierkiewicz wrote:
>>> Hi,
>>>
>>> This patch series contains various cleanups for EXYNOS thermal
>>> driver. Overall it decreases driver's LOC by 9%. It is based
>>> on next-20140731 kernel. It should not cause any functionality
>>> changes.
>>>
>>
>> Did you have the time to test this series?
>
> Hi Eduardo/Bartlomiej,
>
> For the whole series tested on exynos5250 based arndale board.
> Tested-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
>
Thanks! I will pull the series on my tree.
> Sorry for the delay as I was busy in some internal work.
>
> Thanks,
> Amit D
>>
>>> Changes since v2 (https://lkml.org/lkml/2014/6/17/436):
>>> - synced patches against next-20140731
>>> - dropped patch "thermal: exynos: remove dead code for
>>> TYPE_TWO_POINT_TRIMMING calibration" (newly added Exynos3250
>>> SoC support uses TYPE_TWO_POINT_TRIMMING calibration)
>>> - updated patch description for patch #2
>>> - dropped Reviewed-by from Amit from patch #8 (due to changed
>>> scope of the patch)
>>>
>>> Changes since v1 (https://lkml.org/lkml/2014/5/5/194):
>>> - synced patches against next-20140617
>>> - merged patch "thermal: exynos: remove unused defines" into
>>> "thermal: exynos: remove unused struct exynos_tmu_registers
>>> entries" one (per request from Eduardo)
>>> - improved patch descriptions for patches #1-5
>>> - fixed documentation for pdata->gain and pdata->reference_voltage
>>> - added Reviewed-by from Amit to patches #6, #7 and #10
>>> - added missing Acked-by from Kyungmin Park
>>>
>>> Best regards,
>>> --
>>> Bartlomiej Zolnierkiewicz
>>> Samsung R&D Institute Poland
>>> Samsung Electronics
>>>
>>>
>>> Bartlomiej Zolnierkiewicz (8):
>>> thermal: exynos: remove unused struct exynos_tmu_registers entries
>>> thermal: exynos: remove dead code for HW_MODE calibration
>>> thermal: exynos: remove redundant pdata checks from
>>> exynos_tmu_initialize()
>>> thermal: exynos: remove redundant threshold_code checks from
>>> exynos_tmu_initialize()
>>> thermal: exynos: simplify temp_to_code() and code_to_temp()
>>> thermal: exynos: cache non_hw_trigger_levels in pdata
>>> thermal: exynos: remove redundant pdata checks from
>>> exynos_tmu_control()
>>> thermal: exynos: remove identical values from exynos*_tmu_registers
>>> structures
>>>
>>> drivers/thermal/samsung/exynos_thermal_common.h | 1 -
>>> drivers/thermal/samsung/exynos_tmu.c | 126 +++++-------------------
>>> drivers/thermal/samsung/exynos_tmu.h | 74 +-------------
>>> drivers/thermal/samsung/exynos_tmu_data.c | 56 ++---------
>>> drivers/thermal/samsung/exynos_tmu_data.h | 31 +-----
>>> 5 files changed, 35 insertions(+), 253 deletions(-)
>>>
>>> --
>>> 1.8.2.3
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Eduardo Bezerra Valentin
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 0/8] thermal: exynos: various cleanups
2014-09-01 11:05 ` edubezval
@ 2014-08-29 19:25 ` Eduardo Valentin
-1 siblings, 0 replies; 16+ messages in thread
From: Eduardo Valentin @ 2014-08-29 19:25 UTC (permalink / raw)
To: amit daniel kachhap
Cc: Bartlomiej Zolnierkiewicz, Zhang Rui, Tomasz Figa,
Rafael J. Wysocki, Kyungmin Park, linux-samsung-soc, linux-pm,
linux-kernel
On Mon, Sep 01, 2014 at 07:05:27AM -0400, edubezval@gmail.com wrote:
> Amit
>
> On Mon, Sep 1, 2014 at 6:53 AM, amit daniel kachhap
> <amit.daniel@samsung.com> wrote:
> > On Thu, Aug 28, 2014 at 8:19 PM, Eduardo Valentin <edubezval@gmail.com> wrote:
> >> Amit,
> >>
> >> On Thu, Jul 31, 2014 at 07:10:58PM +0200, Bartlomiej Zolnierkiewicz wrote:
> >>> Hi,
> >>>
> >>> This patch series contains various cleanups for EXYNOS thermal
> >>> driver. Overall it decreases driver's LOC by 9%. It is based
> >>> on next-20140731 kernel. It should not cause any functionality
> >>> changes.
> >>>
> >>
> >> Did you have the time to test this series?
> >
> > Hi Eduardo/Bartlomiej,
> >
> > For the whole series tested on exynos5250 based arndale board.
> > Tested-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
> >
>
> Thanks! I will pull the series on my tree.
Pulled into my next branch. Thanks.
>
>
> > Sorry for the delay as I was busy in some internal work.
> >
> > Thanks,
> > Amit D
> >>
> >>> Changes since v2 (https://lkml.org/lkml/2014/6/17/436):
> >>> - synced patches against next-20140731
> >>> - dropped patch "thermal: exynos: remove dead code for
> >>> TYPE_TWO_POINT_TRIMMING calibration" (newly added Exynos3250
> >>> SoC support uses TYPE_TWO_POINT_TRIMMING calibration)
> >>> - updated patch description for patch #2
> >>> - dropped Reviewed-by from Amit from patch #8 (due to changed
> >>> scope of the patch)
> >>>
> >>> Changes since v1 (https://lkml.org/lkml/2014/5/5/194):
> >>> - synced patches against next-20140617
> >>> - merged patch "thermal: exynos: remove unused defines" into
> >>> "thermal: exynos: remove unused struct exynos_tmu_registers
> >>> entries" one (per request from Eduardo)
> >>> - improved patch descriptions for patches #1-5
> >>> - fixed documentation for pdata->gain and pdata->reference_voltage
> >>> - added Reviewed-by from Amit to patches #6, #7 and #10
> >>> - added missing Acked-by from Kyungmin Park
> >>>
> >>> Best regards,
> >>> --
> >>> Bartlomiej Zolnierkiewicz
> >>> Samsung R&D Institute Poland
> >>> Samsung Electronics
> >>>
> >>>
> >>> Bartlomiej Zolnierkiewicz (8):
> >>> thermal: exynos: remove unused struct exynos_tmu_registers entries
> >>> thermal: exynos: remove dead code for HW_MODE calibration
> >>> thermal: exynos: remove redundant pdata checks from
> >>> exynos_tmu_initialize()
> >>> thermal: exynos: remove redundant threshold_code checks from
> >>> exynos_tmu_initialize()
> >>> thermal: exynos: simplify temp_to_code() and code_to_temp()
> >>> thermal: exynos: cache non_hw_trigger_levels in pdata
> >>> thermal: exynos: remove redundant pdata checks from
> >>> exynos_tmu_control()
> >>> thermal: exynos: remove identical values from exynos*_tmu_registers
> >>> structures
> >>>
> >>> drivers/thermal/samsung/exynos_thermal_common.h | 1 -
> >>> drivers/thermal/samsung/exynos_tmu.c | 126 +++++-------------------
> >>> drivers/thermal/samsung/exynos_tmu.h | 74 +-------------
> >>> drivers/thermal/samsung/exynos_tmu_data.c | 56 ++---------
> >>> drivers/thermal/samsung/exynos_tmu_data.h | 31 +-----
> >>> 5 files changed, 35 insertions(+), 253 deletions(-)
> >>>
> >>> --
> >>> 1.8.2.3
> >>>
> >>> --
> >>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> >>> the body of a message to majordomo@vger.kernel.org
> >>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> >> the body of a message to majordomo@vger.kernel.org
> >> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
> --
> Eduardo Bezerra Valentin
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH v3 0/8] thermal: exynos: various cleanups
@ 2014-08-29 19:25 ` Eduardo Valentin
0 siblings, 0 replies; 16+ messages in thread
From: Eduardo Valentin @ 2014-08-29 19:25 UTC (permalink / raw)
To: amit daniel kachhap
Cc: Bartlomiej Zolnierkiewicz, Zhang Rui, Tomasz Figa,
Rafael J. Wysocki, Kyungmin Park, linux-samsung-soc, linux-pm,
linux-kernel
On Mon, Sep 01, 2014 at 07:05:27AM -0400, edubezval@gmail.com wrote:
> Amit
>
> On Mon, Sep 1, 2014 at 6:53 AM, amit daniel kachhap
> <amit.daniel@samsung.com> wrote:
> > On Thu, Aug 28, 2014 at 8:19 PM, Eduardo Valentin <edubezval@gmail.com> wrote:
> >> Amit,
> >>
> >> On Thu, Jul 31, 2014 at 07:10:58PM +0200, Bartlomiej Zolnierkiewicz wrote:
> >>> Hi,
> >>>
> >>> This patch series contains various cleanups for EXYNOS thermal
> >>> driver. Overall it decreases driver's LOC by 9%. It is based
> >>> on next-20140731 kernel. It should not cause any functionality
> >>> changes.
> >>>
> >>
> >> Did you have the time to test this series?
> >
> > Hi Eduardo/Bartlomiej,
> >
> > For the whole series tested on exynos5250 based arndale board.
> > Tested-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
> >
>
> Thanks! I will pull the series on my tree.
Pulled into my next branch. Thanks.
>
>
> > Sorry for the delay as I was busy in some internal work.
> >
> > Thanks,
> > Amit D
> >>
> >>> Changes since v2 (https://lkml.org/lkml/2014/6/17/436):
> >>> - synced patches against next-20140731
> >>> - dropped patch "thermal: exynos: remove dead code for
> >>> TYPE_TWO_POINT_TRIMMING calibration" (newly added Exynos3250
> >>> SoC support uses TYPE_TWO_POINT_TRIMMING calibration)
> >>> - updated patch description for patch #2
> >>> - dropped Reviewed-by from Amit from patch #8 (due to changed
> >>> scope of the patch)
> >>>
> >>> Changes since v1 (https://lkml.org/lkml/2014/5/5/194):
> >>> - synced patches against next-20140617
> >>> - merged patch "thermal: exynos: remove unused defines" into
> >>> "thermal: exynos: remove unused struct exynos_tmu_registers
> >>> entries" one (per request from Eduardo)
> >>> - improved patch descriptions for patches #1-5
> >>> - fixed documentation for pdata->gain and pdata->reference_voltage
> >>> - added Reviewed-by from Amit to patches #6, #7 and #10
> >>> - added missing Acked-by from Kyungmin Park
> >>>
> >>> Best regards,
> >>> --
> >>> Bartlomiej Zolnierkiewicz
> >>> Samsung R&D Institute Poland
> >>> Samsung Electronics
> >>>
> >>>
> >>> Bartlomiej Zolnierkiewicz (8):
> >>> thermal: exynos: remove unused struct exynos_tmu_registers entries
> >>> thermal: exynos: remove dead code for HW_MODE calibration
> >>> thermal: exynos: remove redundant pdata checks from
> >>> exynos_tmu_initialize()
> >>> thermal: exynos: remove redundant threshold_code checks from
> >>> exynos_tmu_initialize()
> >>> thermal: exynos: simplify temp_to_code() and code_to_temp()
> >>> thermal: exynos: cache non_hw_trigger_levels in pdata
> >>> thermal: exynos: remove redundant pdata checks from
> >>> exynos_tmu_control()
> >>> thermal: exynos: remove identical values from exynos*_tmu_registers
> >>> structures
> >>>
> >>> drivers/thermal/samsung/exynos_thermal_common.h | 1 -
> >>> drivers/thermal/samsung/exynos_tmu.c | 126 +++++-------------------
> >>> drivers/thermal/samsung/exynos_tmu.h | 74 +-------------
> >>> drivers/thermal/samsung/exynos_tmu_data.c | 56 ++---------
> >>> drivers/thermal/samsung/exynos_tmu_data.h | 31 +-----
> >>> 5 files changed, 35 insertions(+), 253 deletions(-)
> >>>
> >>> --
> >>> 1.8.2.3
> >>>
> >>> --
> >>> To unsubscribe from this list: send the line "unsubscribe linux-pm" in
> >>> the body of a message to majordomo@vger.kernel.org
> >>> More majordomo info at http://vger.kernel.org/majordomo-info.html
> >> --
> >> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> >> the body of a message to majordomo@vger.kernel.org
> >> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
>
>
> --
> Eduardo Bezerra Valentin
^ permalink raw reply [flat|nested] 16+ messages in thread