Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 18:13:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

thermal: mediatek: add calibration item

Browse Source 
Add calibration item in thermal_data to support
the project with different calibration coefficient.

Signed-off-by: Michael Kao <michael.kao@mediatek.com>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Michael Kao 2019-02-01 15:38:09 +08:00 committed by Eduardo Valentin
parent 1d0819455e
commit f845147669
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/thermal/mtk_thermal.c
View File

@ -105,6 +105,9 @@
/* The number of sensing points per bank */ /* The number of sensing points per bank */
#define MT8173_NUM_SENSORS_PER_ZONE 4 #define MT8173_NUM_SENSORS_PER_ZONE 4
/* The calibration coefficient of sensor */
#define MT8173_CALIBRATION 165
/* /*
* Layout of the fuses providing the calibration data * Layout of the fuses providing the calibration data
* These macros could be used for MT8173, MT2701, and MT2712. * These macros could be used for MT8173, MT2701, and MT2712.
@ -147,6 +150,9 @@ enum {
/* The number of sensing points per bank */ /* The number of sensing points per bank */
#define MT2701_NUM_SENSORS_PER_ZONE 3 #define MT2701_NUM_SENSORS_PER_ZONE 3
/* The calibration coefficient of sensor */
#define MT2701_CALIBRATION 165
/* MT2712 thermal sensors */ /* MT2712 thermal sensors */
#define MT2712_TS1 0 #define MT2712_TS1 0
#define MT2712_TS2 1 #define MT2712_TS2 1
@ -162,12 +168,18 @@ enum {
/* The number of sensing points per bank */ /* The number of sensing points per bank */
#define MT2712_NUM_SENSORS_PER_ZONE 4 #define MT2712_NUM_SENSORS_PER_ZONE 4
/* The calibration coefficient of sensor */
#define MT2712_CALIBRATION 165
#define MT7622_TEMP_AUXADC_CHANNEL 11 #define MT7622_TEMP_AUXADC_CHANNEL 11
#define MT7622_NUM_SENSORS 1 #define MT7622_NUM_SENSORS 1
#define MT7622_NUM_ZONES 1 #define MT7622_NUM_ZONES 1
#define MT7622_NUM_SENSORS_PER_ZONE 1 #define MT7622_NUM_SENSORS_PER_ZONE 1
#define MT7622_TS1 0 #define MT7622_TS1 0
/* The calibration coefficient of sensor */
#define MT7622_CALIBRATION 165
struct mtk_thermal; struct mtk_thermal;
struct thermal_bank_cfg { struct thermal_bank_cfg {
@ -188,6 +200,7 @@ struct mtk_thermal_data {
const int *sensor_mux_values; const int *sensor_mux_values;
const int *msr; const int *msr;
const int *adcpnp; const int *adcpnp;
const int cali_val;
struct thermal_bank_cfg bank_data[]; struct thermal_bank_cfg bank_data[];
}; };
@ -295,6 +308,7 @@ static const struct mtk_thermal_data mt8173_thermal_data = {
.num_banks = MT8173_NUM_ZONES, .num_banks = MT8173_NUM_ZONES,
.num_sensors = MT8173_NUM_SENSORS, .num_sensors = MT8173_NUM_SENSORS,
.vts_index = mt8173_vts_index, .vts_index = mt8173_vts_index,
.cali_val = MT8173_CALIBRATION,
.bank_data = { .bank_data = {
{ {
.num_sensors = 2, .num_sensors = 2,
@ -330,6 +344,7 @@ static const struct mtk_thermal_data mt2701_thermal_data = {
.num_banks = 1, .num_banks = 1,
.num_sensors = MT2701_NUM_SENSORS, .num_sensors = MT2701_NUM_SENSORS,
.vts_index = mt2701_vts_index, .vts_index = mt2701_vts_index,
.cali_val = MT2701_CALIBRATION,
.bank_data = { .bank_data = {
{ {
.num_sensors = 3, .num_sensors = 3,
@ -356,6 +371,7 @@ static const struct mtk_thermal_data mt2712_thermal_data = {
.num_banks = 1, .num_banks = 1,
.num_sensors = MT2712_NUM_SENSORS, .num_sensors = MT2712_NUM_SENSORS,
.vts_index = mt2712_vts_index, .vts_index = mt2712_vts_index,
.cali_val = MT2712_CALIBRATION,
.bank_data = { .bank_data = {
{ {
.num_sensors = 4, .num_sensors = 4,
@ -376,6 +392,7 @@ static const struct mtk_thermal_data mt7622_thermal_data = {
.num_banks = MT7622_NUM_ZONES, .num_banks = MT7622_NUM_ZONES,
.num_sensors = MT7622_NUM_SENSORS, .num_sensors = MT7622_NUM_SENSORS,
.vts_index = mt7622_vts_index, .vts_index = mt7622_vts_index,
.cali_val = MT7622_CALIBRATION,
.bank_data = { .bank_data = {
{ {
.num_sensors = 1, .num_sensors = 1,
@ -402,7 +419,7 @@ static int raw_to_mcelsius(struct mtk_thermal *mt, int sensno, s32 raw)
raw &= 0xfff; raw &= 0xfff;
tmp = 203450520 << 3; tmp = 203450520 << 3;
tmp /= 165 + mt->o_slope; tmp /= mt->conf->cali_val + mt->o_slope;
tmp /= 10000 + mt->adc_ge; tmp /= 10000 + mt->adc_ge;
tmp *= raw - mt->vts[sensno] - 3350; tmp *= raw - mt->vts[sensno] - 3350;
tmp >>= 3; tmp >>= 3;