openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

thermal: exynos: remove parsing of samsung, tmu_default_temp_offset property 

Trimming (one point based or two points based) is always used for
the temperature calibration and the default non-trimming code is
never reached. Remove it and then remove no longer needed parsing
of samsung,tmu_default_temp_offset property.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2018-04-16 12:11:56 +02:00 committed by Eduardo Valentin
parent 3ab9e4175f
commit 9c933b1be5
2 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -249,24 +249,14 @@ static void exynos_report_trigger(struct exynos_tmu_data *p)
static int temp_to_code(struct exynos_tmu_data *data, u8 temp) static int temp_to_code(struct exynos_tmu_data *data, u8 temp)
{ {
struct exynos_tmu_platform_data *pdata = data->pdata; struct exynos_tmu_platform_data *pdata = data->pdata;
int temp_code;
switch (pdata->cal_type) { if (pdata->cal_type == TYPE_ONE_POINT_TRIMMING)
case TYPE_TWO_POINT_TRIMMING: return temp + data->temp_error1 - pdata->first_point_trim;
temp_code = (temp - pdata->first_point_trim) *
return (temp - pdata->first_point_trim) *
(data->temp_error2 - data->temp_error1) / (data->temp_error2 - data->temp_error1) /
(pdata->second_point_trim - pdata->first_point_trim) + (pdata->second_point_trim - pdata->first_point_trim) +
data->temp_error1; data->temp_error1;
break;
case TYPE_ONE_POINT_TRIMMING:
temp_code = temp + data->temp_error1 - pdata->first_point_trim;
break;
default:
temp_code = temp + pdata->default_temp_offset;
break;
}
return temp_code;
} }
/* /*
@ -276,24 +266,14 @@ static int temp_to_code(struct exynos_tmu_data *data, u8 temp)
static int code_to_temp(struct exynos_tmu_data *data, u16 temp_code) static int code_to_temp(struct exynos_tmu_data *data, u16 temp_code)
{ {
struct exynos_tmu_platform_data *pdata = data->pdata; struct exynos_tmu_platform_data *pdata = data->pdata;
int temp;
switch (pdata->cal_type) { if (pdata->cal_type == TYPE_ONE_POINT_TRIMMING)
case TYPE_TWO_POINT_TRIMMING: return temp_code - data->temp_error1 + pdata->first_point_trim;
temp = (temp_code - data->temp_error1) *
return (temp_code - data->temp_error1) *
(pdata->second_point_trim - pdata->first_point_trim) / (pdata->second_point_trim - pdata->first_point_trim) /
(data->temp_error2 - data->temp_error1) + (data->temp_error2 - data->temp_error1) +
pdata->first_point_trim; pdata->first_point_trim;
break;
case TYPE_ONE_POINT_TRIMMING:
temp = temp_code - data->temp_error1 + pdata->first_point_trim;
break;
default:
temp = temp_code - pdata->default_temp_offset;
break;
}
return temp;
} }
static void sanitize_temp_error(struct exynos_tmu_data *data, u32 trim_info) static void sanitize_temp_error(struct exynos_tmu_data *data, u32 trim_info)
@ -1166,8 +1146,6 @@ static int exynos_of_sensor_conf(struct device_node *np,
pdata->first_point_trim = (u8)value; pdata->first_point_trim = (u8)value;
of_property_read_u32(np, "samsung,tmu_second_point_trim", &value); of_property_read_u32(np, "samsung,tmu_second_point_trim", &value);
pdata->second_point_trim = (u8)value; pdata->second_point_trim = (u8)value;
of_property_read_u32(np, "samsung,tmu_default_temp_offset", &value);
pdata->default_temp_offset = (u8)value;
of_property_read_u32(np, "samsung,tmu_cal_type", &pdata->cal_type); of_property_read_u32(np, "samsung,tmu_cal_type", &pdata->cal_type);

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

@ -50,7 +50,6 @@ enum soc_type {
* @efuse_value: platform defined fuse value * @efuse_value: platform defined fuse value
* @min_efuse_value: minimum valid trimming data * @min_efuse_value: minimum valid trimming data
* @max_efuse_value: maximum valid trimming data * @max_efuse_value: maximum valid trimming data
* @default_temp_offset: default temperature offset in case of no trimming
* @cal_type: calibration type for temperature * @cal_type: calibration type for temperature
* *
* This structure is required for configuration of exynos_tmu driver. * This structure is required for configuration of exynos_tmu driver.
@ -65,7 +64,6 @@ struct exynos_tmu_platform_data {
u32 max_efuse_value; u32 max_efuse_value;
u8 first_point_trim; u8 first_point_trim;
u8 second_point_trim; u8 second_point_trim;
u8 default_temp_offset;
u32 cal_type; u32 cal_type;
}; };