Commit 332bc8eb authored by Shawn Guo's avatar Shawn Guo Committed by Daniel Lezcano
Browse files

thermal: qcom: tsens-v0_1: Add support for MSM8939 



The TSENS integrated on MSM8939 is a v0_1 device with 10 sensors.
Different from its predecessor MSM8916, where 'calib_sel' bits sit in
separate qfprom word, MSM8939 has 'cailb' and 'calib_sel' bits mixed and
spread on discrete offsets.  That's why all qfprom bits are read as one
go and later mapped to calibration data for MSM8939.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Tested-by: Konrad Dybcio <konradybcio@gmail.com> /* on Asus Z00T smartphone */
Acked-by: default avatarKonrad Dybcio <konradybcio@gmail.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200629144926.665-3-shawn.guo@linaro.org
parent ec99756a

drivers/thermal/qcom/tsens-v0_1.c

+143 −1
Original line number Diff line number Diff line
@@ -48,6 +48,63 @@ 
#define MSM8916_CAL_SEL_MASK	0xe0000000

#define MSM8916_CAL_SEL_SHIFT	29



/* eeprom layout data for 8939 */

#define MSM8939_BASE0_MASK	0x000000ff

#define MSM8939_BASE1_MASK	0xff000000

#define MSM8939_BASE0_SHIFT	0

#define MSM8939_BASE1_SHIFT	24



#define MSM8939_S0_P1_MASK	0x000001f8

#define MSM8939_S1_P1_MASK	0x001f8000

#define MSM8939_S2_P1_MASK_0_4	0xf8000000

#define MSM8939_S2_P1_MASK_5	0x00000001

#define MSM8939_S3_P1_MASK	0x00001f80

#define MSM8939_S4_P1_MASK	0x01f80000

#define MSM8939_S5_P1_MASK	0x00003f00

#define MSM8939_S6_P1_MASK	0x03f00000

#define MSM8939_S7_P1_MASK	0x0000003f

#define MSM8939_S8_P1_MASK	0x0003f000

#define MSM8939_S9_P1_MASK	0x07e00000



#define MSM8939_S0_P2_MASK	0x00007e00

#define MSM8939_S1_P2_MASK	0x07e00000

#define MSM8939_S2_P2_MASK	0x0000007e

#define MSM8939_S3_P2_MASK	0x0007e000

#define MSM8939_S4_P2_MASK	0x7e000000

#define MSM8939_S5_P2_MASK	0x000fc000

#define MSM8939_S6_P2_MASK	0xfc000000

#define MSM8939_S7_P2_MASK	0x00000fc0

#define MSM8939_S8_P2_MASK	0x00fc0000

#define MSM8939_S9_P2_MASK_0_4	0xf8000000

#define MSM8939_S9_P2_MASK_5	0x00002000



#define MSM8939_S0_P1_SHIFT	3

#define MSM8939_S1_P1_SHIFT	15

#define MSM8939_S2_P1_SHIFT_0_4	27

#define MSM8939_S2_P1_SHIFT_5	0

#define MSM8939_S3_P1_SHIFT	7

#define MSM8939_S4_P1_SHIFT	19

#define MSM8939_S5_P1_SHIFT	8

#define MSM8939_S6_P1_SHIFT	20

#define MSM8939_S7_P1_SHIFT	0

#define MSM8939_S8_P1_SHIFT	12

#define MSM8939_S9_P1_SHIFT	21



#define MSM8939_S0_P2_SHIFT	9

#define MSM8939_S1_P2_SHIFT	21

#define MSM8939_S2_P2_SHIFT	1

#define MSM8939_S3_P2_SHIFT	13

#define MSM8939_S4_P2_SHIFT	25

#define MSM8939_S5_P2_SHIFT	14

#define MSM8939_S6_P2_SHIFT	26

#define MSM8939_S7_P2_SHIFT	6

#define MSM8939_S8_P2_SHIFT	18

#define MSM8939_S9_P2_SHIFT_0_4	27

#define MSM8939_S9_P2_SHIFT_5	13



#define MSM8939_CAL_SEL_MASK	0x7

#define MSM8939_CAL_SEL_SHIFT	0



/* eeprom layout data for 8974 */

#define BASE1_MASK		0xff

#define S0_P1_MASK		0x3f00
@@ -189,6 +246,76 @@ static int calibrate_8916(struct tsens_priv *priv) 
	return 0;

}



static int calibrate_8939(struct tsens_priv *priv)

{

	int base0 = 0, base1 = 0, i;

	u32 p1[10], p2[10];

	int mode = 0;

	u32 *qfprom_cdata;

	u32 cdata[6];



	qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib");

	if (IS_ERR(qfprom_cdata))

		return PTR_ERR(qfprom_cdata);



	/* Mapping between qfprom nvmem and calibration data */

	cdata[0] = qfprom_cdata[12];

	cdata[1] = qfprom_cdata[13];

	cdata[2] = qfprom_cdata[0];

	cdata[3] = qfprom_cdata[1];

	cdata[4] = qfprom_cdata[22];

	cdata[5] = qfprom_cdata[21];



	mode = (cdata[0] & MSM8939_CAL_SEL_MASK) >> MSM8939_CAL_SEL_SHIFT;

	dev_dbg(priv->dev, "calibration mode is %d\n", mode);



	switch (mode) {

	case TWO_PT_CALIB:

		base1 = (cdata[3] & MSM8939_BASE1_MASK) >> MSM8939_BASE1_SHIFT;

		p2[0] = (cdata[0] & MSM8939_S0_P2_MASK) >> MSM8939_S0_P2_SHIFT;

		p2[1] = (cdata[0] & MSM8939_S1_P2_MASK) >> MSM8939_S1_P2_SHIFT;

		p2[2] = (cdata[1] & MSM8939_S2_P2_MASK) >> MSM8939_S2_P2_SHIFT;

		p2[3] = (cdata[1] & MSM8939_S3_P2_MASK) >> MSM8939_S3_P2_SHIFT;

		p2[4] = (cdata[1] & MSM8939_S4_P2_MASK) >> MSM8939_S4_P2_SHIFT;

		p2[5] = (cdata[2] & MSM8939_S5_P2_MASK) >> MSM8939_S5_P2_SHIFT;

		p2[6] = (cdata[2] & MSM8939_S6_P2_MASK) >> MSM8939_S6_P2_SHIFT;

		p2[7] = (cdata[3] & MSM8939_S7_P2_MASK) >> MSM8939_S7_P2_SHIFT;

		p2[8] = (cdata[3] & MSM8939_S8_P2_MASK) >> MSM8939_S8_P2_SHIFT;

		p2[9] = (cdata[4] & MSM8939_S9_P2_MASK_0_4) >> MSM8939_S9_P2_SHIFT_0_4;

		p2[9] |= ((cdata[5] & MSM8939_S9_P2_MASK_5) >> MSM8939_S9_P2_SHIFT_5) << 5;

		for (i = 0; i < priv->num_sensors; i++)

			p2[i] = (base1 + p2[i]) << 2;

		fallthrough;

	case ONE_PT_CALIB2:

		base0 = (cdata[2] & MSM8939_BASE0_MASK) >> MSM8939_BASE0_SHIFT;

		p1[0] = (cdata[0] & MSM8939_S0_P1_MASK) >> MSM8939_S0_P1_SHIFT;

		p1[1] = (cdata[0] & MSM8939_S1_P1_MASK) >> MSM8939_S1_P1_SHIFT;

		p1[2] = (cdata[0] & MSM8939_S2_P1_MASK_0_4) >> MSM8939_S2_P1_SHIFT_0_4;

		p1[2] |= ((cdata[1] & MSM8939_S2_P1_MASK_5) >> MSM8939_S2_P1_SHIFT_5) << 5;

		p1[3] = (cdata[1] & MSM8939_S3_P1_MASK) >> MSM8939_S3_P1_SHIFT;

		p1[4] = (cdata[1] & MSM8939_S4_P1_MASK) >> MSM8939_S4_P1_SHIFT;

		p1[5] = (cdata[2] & MSM8939_S5_P1_MASK) >> MSM8939_S5_P1_SHIFT;

		p1[6] = (cdata[2] & MSM8939_S6_P1_MASK) >> MSM8939_S6_P1_SHIFT;

		p1[7] = (cdata[3] & MSM8939_S7_P1_MASK) >> MSM8939_S7_P1_SHIFT;

		p1[8] = (cdata[3] & MSM8939_S8_P1_MASK) >> MSM8939_S8_P1_SHIFT;

		p1[9] = (cdata[4] & MSM8939_S9_P1_MASK) >> MSM8939_S9_P1_SHIFT;

		for (i = 0; i < priv->num_sensors; i++)

			p1[i] = ((base0) + p1[i]) << 2;

		break;

	default:

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

			p1[i] = 500;

			p2[i] = 780;

		}

		break;

	}



	compute_intercept_slope(priv, p1, p2, mode);

	kfree(qfprom_cdata);



	return 0;

}



static int calibrate_8974(struct tsens_priv *priv)

{

	int base1 = 0, base2 = 0, i;
@@ -325,7 +452,7 @@ static int calibrate_8974(struct tsens_priv *priv) 
	return 0;

}



/* v0.1: 8916, 8974 */

/* v0.1: 8916, 8939, 8974 */



static struct tsens_features tsens_v0_1_feat = {

	.ver_major	= VER_0_1,
@@ -386,6 +513,21 @@ struct tsens_plat_data data_8916 = { 
	.fields	= tsens_v0_1_regfields,

};



static const struct tsens_ops ops_8939 = {

	.init		= init_common,

	.calibrate	= calibrate_8939,

	.get_temp	= get_temp_common,

};



struct tsens_plat_data data_8939 = {

	.num_sensors	= 10,

	.ops		= &ops_8939,

	.hw_ids		= (unsigned int []){ 0, 1, 2, 4, 5, 6, 7, 8, 9, 10 },



	.feat		= &tsens_v0_1_feat,

	.fields	= tsens_v0_1_regfields,

};



static const struct tsens_ops ops_8974 = {

	.init		= init_common,

	.calibrate	= calibrate_8974,

drivers/thermal/qcom/tsens.c

+3 −0
Original line number Diff line number Diff line
@@ -897,6 +897,9 @@ static const struct of_device_id tsens_table[] = { 
	{

		.compatible = "qcom,msm8916-tsens",

		.data = &data_8916,

	}, {

		.compatible = "qcom,msm8939-tsens",

		.data = &data_8939,

	}, {

		.compatible = "qcom,msm8974-tsens",

		.data = &data_8974,

drivers/thermal/qcom/tsens.h

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ int get_temp_common(const struct tsens_sensor *s, int *temp); 
extern struct tsens_plat_data data_8960;



/* TSENS v0.1 targets */

extern struct tsens_plat_data data_8916, data_8974;

extern struct tsens_plat_data data_8916, data_8939, data_8974;



/* TSENS v1 targets */

extern struct tsens_plat_data data_tsens_v1, data_8976;

CRA Git | Maintained and supported by SUSTech CRA and CCSE