Commit 1d081945 authored by Michael Kao's avatar Michael Kao Committed by Eduardo Valentin
Browse files

thermal: mediatek: add common index of vts settings. 



Each project has different number of vts settings.
For the MT2701 just have to set three vts, but the
original code flow add five unnecessary vts.
Add common index of vts settings for scalablity,
and reduce the setting of unnecessary vts.

Signed-off-by: default avatarMichael Kao <michael.kao@mediatek.com>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent eb9aecd9

drivers/thermal/mtk_thermal.c

+69 −24
Original line number Diff line number Diff line
@@ -112,17 +112,26 @@ 
 * MT2701 has 3 sensors and needs 3 VTS calibration data.

 * MT2712 has 4 sensors and needs 4 VTS calibration data.

 */

#define MT8173_CALIB_BUF0_VALID		BIT(0)

#define MT8173_CALIB_BUF1_ADC_GE(x)	(((x) >> 22) & 0x3ff)

#define MT8173_CALIB_BUF0_VTS_TS1(x)	(((x) >> 17) & 0x1ff)

#define MT8173_CALIB_BUF0_VTS_TS2(x)	(((x) >> 8) & 0x1ff)

#define MT8173_CALIB_BUF1_VTS_TS3(x)	(((x) >> 0) & 0x1ff)

#define MT8173_CALIB_BUF2_VTS_TS4(x)	(((x) >> 23) & 0x1ff)

#define MT8173_CALIB_BUF2_VTS_TSABB(x)	(((x) >> 14) & 0x1ff)

#define MT8173_CALIB_BUF0_DEGC_CALI(x)	(((x) >> 1) & 0x3f)

#define MT8173_CALIB_BUF0_O_SLOPE(x)	(((x) >> 26) & 0x3f)

#define MT8173_CALIB_BUF0_O_SLOPE_SIGN(x)	(((x) >> 7) & 0x1)

#define MT8173_CALIB_BUF1_ID(x)	(((x) >> 9) & 0x1)

#define CALIB_BUF0_VALID		BIT(0)

#define CALIB_BUF1_ADC_GE(x)		(((x) >> 22) & 0x3ff)

#define CALIB_BUF0_VTS_TS1(x)		(((x) >> 17) & 0x1ff)

#define CALIB_BUF0_VTS_TS2(x)		(((x) >> 8) & 0x1ff)

#define CALIB_BUF1_VTS_TS3(x)		(((x) >> 0) & 0x1ff)

#define CALIB_BUF2_VTS_TS4(x)		(((x) >> 23) & 0x1ff)

#define CALIB_BUF2_VTS_TSABB(x)		(((x) >> 14) & 0x1ff)

#define CALIB_BUF0_DEGC_CALI(x)		(((x) >> 1) & 0x3f)

#define CALIB_BUF0_O_SLOPE(x)		(((x) >> 26) & 0x3f)

#define CALIB_BUF0_O_SLOPE_SIGN(x)	(((x) >> 7) & 0x1)

#define CALIB_BUF1_ID(x)		(((x) >> 9) & 0x1)



enum {

	VTS1,

	VTS2,

	VTS3,

	VTS4,

	VTSABB,

	MAX_NUM_VTS,

};



/* MT2701 thermal sensors */

#define MT2701_TS1	0
@@ -175,6 +184,7 @@ struct mtk_thermal_data { 
	s32 num_banks;

	s32 num_sensors;

	s32 auxadc_channel;

	const int *vts_index;

	const int *sensor_mux_values;

	const int *msr;

	const int *adcpnp;
@@ -194,7 +204,7 @@ struct mtk_thermal { 
	s32 adc_ge;

	s32 degc_cali;

	s32 o_slope;

	s32 vts[MT8173_NUM_SENSORS];

	s32 vts[MAX_NUM_VTS];



	const struct mtk_thermal_data *conf;

	struct mtk_thermal_bank banks[];
@@ -218,6 +228,10 @@ static const int mt8173_adcpnp[MT8173_NUM_SENSORS_PER_ZONE] = { 


static const int mt8173_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 };



static const int mt8173_vts_index[MT8173_NUM_SENSORS] = {

	VTS1, VTS2, VTS3, VTS4, VTSABB

};



/* MT2701 thermal sensor data */

static const int mt2701_bank_data[MT2701_NUM_SENSORS] = {

	MT2701_TS1, MT2701_TS2, MT2701_TSABB
@@ -233,6 +247,10 @@ static const int mt2701_adcpnp[MT2701_NUM_SENSORS_PER_ZONE] = { 


static const int mt2701_mux_values[MT2701_NUM_SENSORS] = { 0, 1, 16 };



static const int mt2701_vts_index[MT2701_NUM_SENSORS] = {

	VTS1, VTS2, VTS3

};



/* MT2712 thermal sensor data */

static const int mt2712_bank_data[MT2712_NUM_SENSORS] = {

	MT2712_TS1, MT2712_TS2, MT2712_TS3, MT2712_TS4
@@ -248,11 +266,16 @@ static const int mt2712_adcpnp[MT2712_NUM_SENSORS_PER_ZONE] = { 


static const int mt2712_mux_values[MT2712_NUM_SENSORS] = { 0, 1, 2, 3 };



static const int mt2712_vts_index[MT2712_NUM_SENSORS] = {

	VTS1, VTS2, VTS3, VTS4

};



/* MT7622 thermal sensor data */

static const int mt7622_bank_data[MT7622_NUM_SENSORS] = { MT7622_TS1, };

static const int mt7622_msr[MT7622_NUM_SENSORS_PER_ZONE] = { TEMP_MSR0, };

static const int mt7622_adcpnp[MT7622_NUM_SENSORS_PER_ZONE] = { TEMP_ADCPNP0, };

static const int mt7622_mux_values[MT7622_NUM_SENSORS] = { 0, };

static const int mt7622_vts_index[MT7622_NUM_SENSORS] = { VTS1 };



/**

 * The MT8173 thermal controller has four banks. Each bank can read up to
@@ -271,6 +294,7 @@ static const struct mtk_thermal_data mt8173_thermal_data = { 
	.auxadc_channel = MT8173_TEMP_AUXADC_CHANNEL,

	.num_banks = MT8173_NUM_ZONES,

	.num_sensors = MT8173_NUM_SENSORS,

	.vts_index = mt8173_vts_index,

	.bank_data = {

		{

			.num_sensors = 2,
@@ -305,6 +329,7 @@ static const struct mtk_thermal_data mt2701_thermal_data = { 
	.auxadc_channel = MT2701_TEMP_AUXADC_CHANNEL,

	.num_banks = 1,

	.num_sensors = MT2701_NUM_SENSORS,

	.vts_index = mt2701_vts_index,

	.bank_data = {

		{

			.num_sensors = 3,
@@ -330,6 +355,7 @@ static const struct mtk_thermal_data mt2712_thermal_data = { 
	.auxadc_channel = MT2712_TEMP_AUXADC_CHANNEL,

	.num_banks = 1,

	.num_sensors = MT2712_NUM_SENSORS,

	.vts_index = mt2712_vts_index,

	.bank_data = {

		{

			.num_sensors = 4,
@@ -349,6 +375,7 @@ static const struct mtk_thermal_data mt7622_thermal_data = { 
	.auxadc_channel = MT7622_TEMP_AUXADC_CHANNEL,

	.num_banks = MT7622_NUM_ZONES,

	.num_sensors = MT7622_NUM_SENSORS,

	.vts_index = mt7622_vts_index,

	.bank_data = {

		{

			.num_sensors = 1,
@@ -629,19 +656,37 @@ static int mtk_thermal_get_calibration_data(struct device *dev, 
		goto out;

	}



	if (buf[0] & MT8173_CALIB_BUF0_VALID) {

		mt->adc_ge = MT8173_CALIB_BUF1_ADC_GE(buf[1]);

		mt->vts[MT8173_TS1] = MT8173_CALIB_BUF0_VTS_TS1(buf[0]);

		mt->vts[MT8173_TS2] = MT8173_CALIB_BUF0_VTS_TS2(buf[0]);

		mt->vts[MT8173_TS3] = MT8173_CALIB_BUF1_VTS_TS3(buf[1]);

		mt->vts[MT8173_TS4] = MT8173_CALIB_BUF2_VTS_TS4(buf[2]);

		mt->vts[MT8173_TSABB] = MT8173_CALIB_BUF2_VTS_TSABB(buf[2]);

		mt->degc_cali = MT8173_CALIB_BUF0_DEGC_CALI(buf[0]);

		if (MT8173_CALIB_BUF1_ID(buf[1]) &

		    MT8173_CALIB_BUF0_O_SLOPE_SIGN(buf[0]))

			mt->o_slope = -MT8173_CALIB_BUF0_O_SLOPE(buf[0]);

	if (buf[0] & CALIB_BUF0_VALID) {

		mt->adc_ge = CALIB_BUF1_ADC_GE(buf[1]);



		for (i = 0; i < mt->conf->num_sensors; i++) {

			switch (mt->conf->vts_index[i]) {

			case VTS1:

				mt->vts[VTS1] = CALIB_BUF0_VTS_TS1(buf[0]);

				break;

			case VTS2:

				mt->vts[VTS2] = CALIB_BUF0_VTS_TS2(buf[0]);

				break;

			case VTS3:

				mt->vts[VTS3] = CALIB_BUF1_VTS_TS3(buf[1]);

				break;

			case VTS4:

				mt->vts[VTS4] = CALIB_BUF2_VTS_TS4(buf[2]);

				break;

			case VTSABB:

				mt->vts[VTSABB] = CALIB_BUF2_VTS_TSABB(buf[2]);

				break;

			default:

				break;

			}

		}



		mt->degc_cali = CALIB_BUF0_DEGC_CALI(buf[0]);

		if (CALIB_BUF1_ID(buf[1]) &

		    CALIB_BUF0_O_SLOPE_SIGN(buf[0]))

			mt->o_slope = -CALIB_BUF0_O_SLOPE(buf[0]);

		else

			mt->o_slope = MT8173_CALIB_BUF0_O_SLOPE(buf[0]);

			mt->o_slope = CALIB_BUF0_O_SLOPE(buf[0]);

	} else {

		dev_info(dev, "Device not calibrated, using default calibration values\n");

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE