Add TSENS support for MSM8956/76
v2 cover Add TSENS support for MSM8956/76
From: AngeloGioacchino Del Regno <[email protected]>
Add the TSENS support for MSM8956/76 using TSENS IP v1.
This code has been tested on two Sony phones featuring the Qualcomm MSM8956 SoC.
Changes in v2:
- Switched documentation to YAML (Amit)
- Changed code style as per request (Amit)
AngeloGioacchino Del Regno (2):
thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976
dt: thermal: tsens: Document compatible for MSM8976/56
.../bindings/thermal/qcom-tsens.yaml | 2 + drivers/thermal/qcom/tsens-v1.c | 167 +++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 4 files changed, 172 insertions(+), 2 deletions(-)
Signature · 1 line
2.21.0
PATCH v2 1/2 thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976
From: AngeloGioacchino Del Regno <[email protected]>
Add support for reading calibrated value from thermistors in MSM8956, MSM8976 and their APQ variants.
--- drivers/thermal/qcom/tsens-v1.c | 167 +++++++++++++++++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 3 files changed, 170 insertions(+), 2 deletions(-)
drivers/thermal/qcom/tsens-v1.c +166 -1
@@ -18,6 +18,68 @@#define TM_Sn_STATUS_OFF 0x0044#define TM_TRDY_OFF 0x0084 +/* eeprom layout data for msm8956/76 (v1) */ +#define MSM8976_BASE0_MASK 0xff +#define MSM8976_BASE1_MASK 0xff +#define MSM8976_BASE1_SHIFT 8 + +#define MSM8976_S0_P1_MASK 0x3f00 +#define MSM8976_S1_P1_MASK 0x3f00000 +#define MSM8976_S2_P1_MASK 0x3f +#define MSM8976_S3_P1_MASK 0x3f000 +#define MSM8976_S4_P1_MASK 0x3f00 +#define MSM8976_S5_P1_MASK 0x3f00000 +#define MSM8976_S6_P1_MASK 0x3f +#define MSM8976_S7_P1_MASK 0x3f000 +#define MSM8976_S8_P1_MASK 0x1f8 +#define MSM8976_S9_P1_MASK 0x1f8000 +#define MSM8976_S10_P1_MASK 0xf8000000 +#define MSM8976_S10_P1_MASK_1 0x1 + +#define MSM8976_S0_P2_MASK 0xfc000 +#define MSM8976_S1_P2_MASK 0xfc000000 +#define MSM8976_S2_P2_MASK 0xfc0 +#define MSM8976_S3_P2_MASK 0xfc0000 +#define MSM8976_S4_P2_MASK 0xfc000 +#define MSM8976_S5_P2_MASK 0xfc000000 +#define MSM8976_S6_P2_MASK 0xfc0 +#define MSM8976_S7_P2_MASK 0xfc0000 +#define MSM8976_S8_P2_MASK 0x7e00 +#define MSM8976_S9_P2_MASK 0x7e00000 +#define MSM8976_S10_P2_MASK 0x7e + +#define MSM8976_S0_P1_SHIFT 8 +#define MSM8976_S1_P1_SHIFT 20 +#define MSM8976_S2_P1_SHIFT 0 +#define MSM8976_S3_P1_SHIFT 12 +#define MSM8976_S4_P1_SHIFT 8 +#define MSM8976_S5_P1_SHIFT 20 +#define MSM8976_S6_P1_SHIFT 0 +#define MSM8976_S7_P1_SHIFT 12 +#define MSM8976_S8_P1_SHIFT 3 +#define MSM8976_S9_P1_SHIFT 15 +#define MSM8976_S10_P1_SHIFT 27 +#define MSM8976_S10_P1_SHIFT_1 0 + +#define MSM8976_S0_P2_SHIFT 14 +#define MSM8976_S1_P2_SHIFT 26 +#define MSM8976_S2_P2_SHIFT 6 +#define MSM8976_S3_P2_SHIFT 18 +#define MSM8976_S4_P2_SHIFT 14 +#define MSM8976_S5_P2_SHIFT 26 +#define MSM8976_S6_P2_SHIFT 6 +#define MSM8976_S7_P2_SHIFT 18 +#define MSM8976_S8_P2_SHIFT 9 +#define MSM8976_S9_P2_SHIFT 21 +#define MSM8976_S10_P2_SHIFT 1 + +#define MSM8976_CAL_SEL_MASK 0x3 + +#define MSM8976_CAL_DEGC_PT1 30 +#define MSM8976_CAL_DEGC_PT2 120 +#define MSM8976_SLOPE_FACTOR 1000 +#define MSM8976_SLOPE_DEFAULT 3200 +/* eeprom layout data for qcs404/405 (v1) */ #define BASE0_MASK 0x000007f8#define BASE1_MASK 0x0007f800
@@ -77,6 +139,30 @@#define CAL_SEL_MASK 7#define CAL_SEL_SHIFT 0 +static void compute_intercept_slope_8976 (struct tsens_priv *priv, +u32 *p1,u32 *p2,u32 mode) +{ +int i; + + priv->sensor[0 ].slope =3313 ; + priv->sensor[1 ].slope =3275 ; + priv->sensor[2 ].slope =3320 ; + priv->sensor[3 ].slope =3246 ; + priv->sensor[4 ].slope =3279 ; + priv->sensor[5 ].slope =3257 ; + priv->sensor[6 ].slope =3234 ; + priv->sensor[7 ].slope =3269 ; + priv->sensor[8 ].slope =3255 ; + priv->sensor[9 ].slope =3239 ; + priv->sensor[10 ].slope =3286 ; + +for (i =0 ; i < priv->num_sensors; i++) { + priv->sensor[i].offset = (p1[i] *MSM8976_SLOPE_FACTOR ) - + (MSM8976_CAL_DEGC_PT1 * + priv->sensor[i].slope); + } +} +static int calibrate_v1 (struct tsens_priv *priv) {u32 base0 =0 , base1 =0 ;
@@ -142,7 +228,71 @@ static int calibrate_v1(struct tsens_priv *priv)return 0 ; } -/* v1.x: qcs404,405 */ +static int calibrate_8976 (struct tsens_priv *priv) +{ +int base0 =0 , base1 =0 , i; +u32 p1[11 ], p2[11 ]; +int mode =0 , tmp =0 ; +u32 *qfprom_cdata; + + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" ); +if (IS_ERR (qfprom_cdata)) +return PTR_ERR (qfprom_cdata); + + mode = (qfprom_cdata[4 ] &MSM8976_CAL_SEL_MASK ); +dev_dbg (priv->dev,"calibration mode is %d\n" , mode); + +switch (mode) { +case TWO_PT_CALIB : + base1 = (qfprom_cdata[2 ] &MSM8976_BASE1_MASK ) >>MSM8976_BASE1_SHIFT ; + p2[0 ] = (qfprom_cdata[0 ] &MSM8976_S0_P2_MASK ) >>MSM8976_S0_P2_SHIFT ; + p2[1 ] = (qfprom_cdata[0 ] &MSM8976_S1_P2_MASK ) >>MSM8976_S1_P2_SHIFT ; + p2[2 ] = (qfprom_cdata[1 ] &MSM8976_S2_P2_MASK ) >>MSM8976_S2_P2_SHIFT ; + p2[3 ] = (qfprom_cdata[1 ] &MSM8976_S3_P2_MASK ) >>MSM8976_S3_P2_SHIFT ; + p2[4 ] = (qfprom_cdata[2 ] &MSM8976_S4_P2_MASK ) >>MSM8976_S4_P2_SHIFT ; + p2[5 ] = (qfprom_cdata[2 ] &MSM8976_S5_P2_MASK ) >>MSM8976_S5_P2_SHIFT ; + p2[6 ] = (qfprom_cdata[3 ] &MSM8976_S6_P2_MASK ) >>MSM8976_S6_P2_SHIFT ; + p2[7 ] = (qfprom_cdata[3 ] &MSM8976_S7_P2_MASK ) >>MSM8976_S7_P2_SHIFT ; + p2[8 ] = (qfprom_cdata[4 ] &MSM8976_S8_P2_MASK ) >>MSM8976_S8_P2_SHIFT ; + p2[9 ] = (qfprom_cdata[4 ] &MSM8976_S9_P2_MASK ) >>MSM8976_S9_P2_SHIFT ; + p2[10 ] = (qfprom_cdata[5 ] &MSM8976_S10_P2_MASK ) >>MSM8976_S10_P2_SHIFT ; + +for (i =0 ; i < priv->num_sensors; i++) + p2[i] = ((base1 + p2[i]) <<2 ); +/* Fall through */ +case ONE_PT_CALIB2 : + base0 = qfprom_cdata[0 ] &MSM8976_BASE0_MASK ; + p1[0 ] = (qfprom_cdata[0 ] &MSM8976_S0_P1_MASK ) >>MSM8976_S0_P1_SHIFT ; + p1[1 ] = (qfprom_cdata[0 ] &MSM8976_S1_P1_MASK ) >>MSM8976_S1_P1_SHIFT ; + p1[2 ] = (qfprom_cdata[1 ] &MSM8976_S2_P1_MASK ) >>MSM8976_S2_P1_SHIFT ; + p1[3 ] = (qfprom_cdata[1 ] &MSM8976_S3_P1_MASK ) >>MSM8976_S3_P1_SHIFT ; + p1[4 ] = (qfprom_cdata[2 ] &MSM8976_S4_P1_MASK ) >>MSM8976_S4_P1_SHIFT ; + p1[5 ] = (qfprom_cdata[2 ] &MSM8976_S5_P1_MASK ) >>MSM8976_S5_P1_SHIFT ; + p1[6 ] = (qfprom_cdata[3 ] &MSM8976_S6_P1_MASK ) >>MSM8976_S6_P1_SHIFT ; + p1[7 ] = (qfprom_cdata[3 ] &MSM8976_S7_P1_MASK ) >>MSM8976_S7_P1_SHIFT ; + p1[8 ] = (qfprom_cdata[4 ] &MSM8976_S8_P1_MASK ) >>MSM8976_S8_P1_SHIFT ; + p1[9 ] = (qfprom_cdata[4 ] &MSM8976_S9_P1_MASK ) >>MSM8976_S9_P1_SHIFT ; + p1[10 ] = (qfprom_cdata[4 ] &MSM8976_S10_P1_MASK ) >>MSM8976_S10_P1_SHIFT ; + tmp = (qfprom_cdata[5 ] &MSM8976_S10_P1_MASK_1 ) <<MSM8976_S10_P1_SHIFT_1 ; + p1[10 ] |= tmp; + +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_8976 (priv, p1, p2, mode); + +return 0 ; +} + +/* v1.x: msm8956,8976,qcs404,405 */ static const struct tsens_features tsens_v1_feat = { .ver_major =VER_1_X ,
@@ -191,3 +341,18 @@ const struct tsens_plat_data data_tsens_v1 = { .feat = &tsens_v1_feat, .fields = tsens_v1_regfields, }; + +static const struct tsens_ops ops_8976 = { + .init = init_common, + .calibrate = calibrate_8976, + .get_temp = get_temp_tsens_valid, +}; + +/* Valid for both MSM8956 and MSM8976. Sensor ID 3 is unused. */ +const struct tsens_plat_data data_8976 = { + .num_sensors =11 , + .ops = &ops_8976, + .hw_ids = (unsigned int []){0 ,1 ,2 ,4 ,5 ,6 ,7 ,8 ,9 ,10 }, + .feat = &tsens_v1_feat, + .fields = tsens_v1_regfields, +};
drivers/thermal/qcom/tsens.c +3 -0
@@ -60,6 +60,9 @@ static const struct of_device_id tsens_table[] = { }, { .compatible = "qcom,msm8974-tsens", .data = &data_8974, + }, { + .compatible = "qcom,msm8976-tsens", + .data = &data_8976, }, { .compatible = "qcom,msm8996-tsens", .data = &data_8996,
drivers/thermal/qcom/tsens.h +1 -1
@@ -323,7 +323,7 @@ extern const struct tsens_plat_data data_8960;extern const struct tsens_plat_data data_8916, data_8974;/* TSENS v1 targets */ -extern const struct tsens_plat_data data_tsens_v1; +extern const struct tsens_plat_data data_tsens_v1, data_8976;/* TSENS v2 targets */ extern const struct tsens_plat_data data_8996, data_tsens_v2;
Signature · 1 line
2.21.0
Re: [PATCH v2 1/2] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976
Quoted 121 lines · On Tue, Oct 1, 2019 at 2:27 PM <[email protected]> wrote:
From: AngeloGioacchino Del Regno <[email protected]>
Add support for reading calibrated value from thermistors in MSM8956, MSM8976 and their APQ variants.
Signed-off-by AngeloGioacchino Del Regno <[email protected]>--- drivers/thermal/qcom/tsens-v1.c | 167 +++++++++++++++++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 3 files changed, 170 insertions(+), 2 deletions(-)drivers/thermal/qcom/tsens-v1.c +86
-0@@ -18,6 +18,68 @@#define TM_Sn_STATUS_OFF 0x0044#define TM_TRDY_OFF 0x0084 +/* eeprom layout data for msm8956/76 (v1) */ +#define MSM8976_BASE0_MASK 0xff +#define MSM8976_BASE1_MASK 0xff +#define MSM8976_BASE1_SHIFT 8 + +#define MSM8976_S0_P1_MASK 0x3f00 +#define MSM8976_S1_P1_MASK 0x3f00000 +#define MSM8976_S2_P1_MASK 0x3f +#define MSM8976_S3_P1_MASK 0x3f000 +#define MSM8976_S4_P1_MASK 0x3f00 +#define MSM8976_S5_P1_MASK 0x3f00000 +#define MSM8976_S6_P1_MASK 0x3f +#define MSM8976_S7_P1_MASK 0x3f000 +#define MSM8976_S8_P1_MASK 0x1f8 +#define MSM8976_S9_P1_MASK 0x1f8000 +#define MSM8976_S10_P1_MASK 0xf8000000 +#define MSM8976_S10_P1_MASK_1 0x1 + +#define MSM8976_S0_P2_MASK 0xfc000 +#define MSM8976_S1_P2_MASK 0xfc000000 +#define MSM8976_S2_P2_MASK 0xfc0 +#define MSM8976_S3_P2_MASK 0xfc0000 +#define MSM8976_S4_P2_MASK 0xfc000 +#define MSM8976_S5_P2_MASK 0xfc000000 +#define MSM8976_S6_P2_MASK 0xfc0 +#define MSM8976_S7_P2_MASK 0xfc0000 +#define MSM8976_S8_P2_MASK 0x7e00 +#define MSM8976_S9_P2_MASK 0x7e00000 +#define MSM8976_S10_P2_MASK 0x7e + +#define MSM8976_S0_P1_SHIFT 8 +#define MSM8976_S1_P1_SHIFT 20 +#define MSM8976_S2_P1_SHIFT 0 +#define MSM8976_S3_P1_SHIFT 12 +#define MSM8976_S4_P1_SHIFT 8 +#define MSM8976_S5_P1_SHIFT 20 +#define MSM8976_S6_P1_SHIFT 0 +#define MSM8976_S7_P1_SHIFT 12 +#define MSM8976_S8_P1_SHIFT 3 +#define MSM8976_S9_P1_SHIFT 15 +#define MSM8976_S10_P1_SHIFT 27 +#define MSM8976_S10_P1_SHIFT_1 0 + +#define MSM8976_S0_P2_SHIFT 14 +#define MSM8976_S1_P2_SHIFT 26 +#define MSM8976_S2_P2_SHIFT 6 +#define MSM8976_S3_P2_SHIFT 18 +#define MSM8976_S4_P2_SHIFT 14 +#define MSM8976_S5_P2_SHIFT 26 +#define MSM8976_S6_P2_SHIFT 6 +#define MSM8976_S7_P2_SHIFT 18 +#define MSM8976_S8_P2_SHIFT 9 +#define MSM8976_S9_P2_SHIFT 21 +#define MSM8976_S10_P2_SHIFT 1 + +#define MSM8976_CAL_SEL_MASK 0x3 + +#define MSM8976_CAL_DEGC_PT1 30 +#define MSM8976_CAL_DEGC_PT2 120 +#define MSM8976_SLOPE_FACTOR 1000 +#define MSM8976_SLOPE_DEFAULT 3200 +/* eeprom layout data for qcs404/405 (v1) */ #define BASE0_MASK 0x000007f8#define BASE1_MASK 0x0007f800@@ -77,6 +139,30 @@#define CAL_SEL_MASK 7#define CAL_SEL_SHIFT 0 +static void compute_intercept_slope_8976 (struct tsens_priv *priv, +u32 *p1,u32 *p2,u32 mode) +{ +int i; + + priv->sensor[0 ].slope =3313 ; + priv->sensor[1 ].slope =3275 ; + priv->sensor[2 ].slope =3320 ; + priv->sensor[3 ].slope =3246 ; + priv->sensor[4 ].slope =3279 ; + priv->sensor[5 ].slope =3257 ; + priv->sensor[6 ].slope =3234 ; + priv->sensor[7 ].slope =3269 ; + priv->sensor[8 ].slope =3255 ; + priv->sensor[9 ].slope =3239 ; + priv->sensor[10 ].slope =3286 ; + +for (i =0 ; i < priv->num_sensors; i++) { + priv->sensor[i].offset = (p1[i] *MSM8976_SLOPE_FACTOR ) - + (MSM8976_CAL_DEGC_PT1 * + priv->sensor[i].slope); + } +} +static int calibrate_v1 (struct tsens_priv *priv) {u32 base0 =0 , base1 =0 ;@@ -142,7 +228,71 @@ static int calibrate_v1(struct tsens_priv *priv)return 0 ; }
drivers/thermal/qcom/tsens-v1.c static int calibrate_v1(struct tsens_priv *priv) · line 239
Quoted 10 lines
drivers/thermal/qcom/tsens-v1.c +9
-1-/* v1.x: qcs404,405 */ +static int calibrate_8976 (struct tsens_priv *priv) +{ +int base0 =0 , base1 =0 , i; +u32 p1[11 ], p2[11 ]; +int mode =0 , tmp =0 ; +u32 *qfprom_cdata; + + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" ); +if (IS_ERR (qfprom_cdata))
kfree(qfprom_data) here
Quoted 42 lines
drivers/thermal/qcom/tsens-v1.c +42
-0+return PTR_ERR (qfprom_cdata); + + mode = (qfprom_cdata[4 ] &MSM8976_CAL_SEL_MASK ); +dev_dbg (priv->dev,"calibration mode is %d\n" , mode); + +switch (mode) { +case TWO_PT_CALIB : + base1 = (qfprom_cdata[2 ] &MSM8976_BASE1_MASK ) >>MSM8976_BASE1_SHIFT ; + p2[0 ] = (qfprom_cdata[0 ] &MSM8976_S0_P2_MASK ) >>MSM8976_S0_P2_SHIFT ; + p2[1 ] = (qfprom_cdata[0 ] &MSM8976_S1_P2_MASK ) >>MSM8976_S1_P2_SHIFT ; + p2[2 ] = (qfprom_cdata[1 ] &MSM8976_S2_P2_MASK ) >>MSM8976_S2_P2_SHIFT ; + p2[3 ] = (qfprom_cdata[1 ] &MSM8976_S3_P2_MASK ) >>MSM8976_S3_P2_SHIFT ; + p2[4 ] = (qfprom_cdata[2 ] &MSM8976_S4_P2_MASK ) >>MSM8976_S4_P2_SHIFT ; + p2[5 ] = (qfprom_cdata[2 ] &MSM8976_S5_P2_MASK ) >>MSM8976_S5_P2_SHIFT ; + p2[6 ] = (qfprom_cdata[3 ] &MSM8976_S6_P2_MASK ) >>MSM8976_S6_P2_SHIFT ; + p2[7 ] = (qfprom_cdata[3 ] &MSM8976_S7_P2_MASK ) >>MSM8976_S7_P2_SHIFT ; + p2[8 ] = (qfprom_cdata[4 ] &MSM8976_S8_P2_MASK ) >>MSM8976_S8_P2_SHIFT ; + p2[9 ] = (qfprom_cdata[4 ] &MSM8976_S9_P2_MASK ) >>MSM8976_S9_P2_SHIFT ; + p2[10 ] = (qfprom_cdata[5 ] &MSM8976_S10_P2_MASK ) >>MSM8976_S10_P2_SHIFT ; + +for (i =0 ; i < priv->num_sensors; i++) + p2[i] = ((base1 + p2[i]) <<2 ); +/* Fall through */ +case ONE_PT_CALIB2 : + base0 = qfprom_cdata[0 ] &MSM8976_BASE0_MASK ; + p1[0 ] = (qfprom_cdata[0 ] &MSM8976_S0_P1_MASK ) >>MSM8976_S0_P1_SHIFT ; + p1[1 ] = (qfprom_cdata[0 ] &MSM8976_S1_P1_MASK ) >>MSM8976_S1_P1_SHIFT ; + p1[2 ] = (qfprom_cdata[1 ] &MSM8976_S2_P1_MASK ) >>MSM8976_S2_P1_SHIFT ; + p1[3 ] = (qfprom_cdata[1 ] &MSM8976_S3_P1_MASK ) >>MSM8976_S3_P1_SHIFT ; + p1[4 ] = (qfprom_cdata[2 ] &MSM8976_S4_P1_MASK ) >>MSM8976_S4_P1_SHIFT ; + p1[5 ] = (qfprom_cdata[2 ] &MSM8976_S5_P1_MASK ) >>MSM8976_S5_P1_SHIFT ; + p1[6 ] = (qfprom_cdata[3 ] &MSM8976_S6_P1_MASK ) >>MSM8976_S6_P1_SHIFT ; + p1[7 ] = (qfprom_cdata[3 ] &MSM8976_S7_P1_MASK ) >>MSM8976_S7_P1_SHIFT ; + p1[8 ] = (qfprom_cdata[4 ] &MSM8976_S8_P1_MASK ) >>MSM8976_S8_P1_SHIFT ; + p1[9 ] = (qfprom_cdata[4 ] &MSM8976_S9_P1_MASK ) >>MSM8976_S9_P1_SHIFT ; + p1[10 ] = (qfprom_cdata[4 ] &MSM8976_S10_P1_MASK ) >>MSM8976_S10_P1_SHIFT ; + tmp = (qfprom_cdata[5 ] &MSM8976_S10_P1_MASK_1 ) <<MSM8976_S10_P1_SHIFT_1 ; + p1[10 ] |= tmp; + +for (i =0 ; i < priv->num_sensors; i++) + p1[i] = (((base0) + p1[i]) <<2 ); +break ;
drivers/thermal/qcom/tsens-v1.c static int calibrate_v1(struct tsens_priv *priv) · line 291
Quoted 10 lines
drivers/thermal/qcom/tsens-v1.c +10
-0+default : +for (i =0 ; i < priv->num_sensors; i++) { + p1[i] =500 ; + p2[i] =780 ; + } +break ; + } + +compute_intercept_slope_8976 (priv, p1, p2, mode); +
kfree(qfprom_data) here
Quoted 56 lines
drivers/thermal/qcom/tsens-v1.c +19
-0+return 0 ; +} + +/* v1.x: msm8956,8976,qcs404,405 */ static const struct tsens_features tsens_v1_feat = { .ver_major =VER_1_X ,@@ -191,3 +341,18 @@ const struct tsens_plat_data data_tsens_v1 = { .feat = &tsens_v1_feat, .fields = tsens_v1_regfields, }; + +static const struct tsens_ops ops_8976 = { + .init = init_common, + .calibrate = calibrate_8976, + .get_temp = get_temp_tsens_valid, +}; + +/* Valid for both MSM8956 and MSM8976. Sensor ID 3 is unused. */ +const struct tsens_plat_data data_8976 = { + .num_sensors =11 , + .ops = &ops_8976, + .hw_ids = (unsigned int []){0 ,1 ,2 ,4 ,5 ,6 ,7 ,8 ,9 ,10 }, + .feat = &tsens_v1_feat, + .fields = tsens_v1_regfields, +};drivers/thermal/qcom/tsens.c +3
-0@@ -60,6 +60,9 @@ static const struct of_device_id tsens_table[] = { }, { .compatible = "qcom,msm8974-tsens", .data = &data_8974, + }, { + .compatible = "qcom,msm8976-tsens", + .data = &data_8976, }, { .compatible = "qcom,msm8996-tsens", .data = &data_8996,drivers/thermal/qcom/tsens.h +1
-2@@ -323,7 +323,7 @@ extern const struct tsens_plat_data data_8960;extern const struct tsens_plat_data data_8916, data_8974;/* TSENS v1 targets */ -extern const struct tsens_plat_data data_tsens_v1; +extern const struct tsens_plat_data data_tsens_v1, data_8976;/* TSENS v2 targets */ extern const struct tsens_plat_data data_8996, data_tsens_v2; --2.21.0
Re: [PATCH v2 1/2] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976
Quoted 9 lines · Amit Kucheria
Quoted 8 lines · On Tue, Oct 1, 2019 at 2:27 PM <[email protected]> wrote:
From: AngeloGioacchino Del Regno <[email protected]>
Add support for reading calibrated value from thermistors in MSM8956, MSM8976 and their APQ variants.
Signed-off-by AngeloGioacchino Del Regno <[email protected]>---
[ ... ]
Quoted 4 lines
Quoted 4 lines
drivers/thermal/qcom/tsens-v1.c +3
-1-/* v1.x: qcs404,405 */ +static int calibrate_8976 (struct tsens_priv *priv) +{ +int base0 =0 , base1 =0 , i;
Quoted 8 lines
drivers/thermal/qcom/tsens-v1.c static int calibrate_v1(struct tsens_priv *priv) · line 239
Quoted 6 lines
drivers/thermal/qcom/tsens-v1.c +6
-0+u32 p1[11 ], p2[11 ]; +int mode =0 , tmp =0 ; +u32 *qfprom_cdata; + + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" ); +if (IS_ERR (qfprom_cdata))
kfree(qfprom_data)here
(Assuming s/qfprom_data/qfprom_cdata/)
Where the allocation happen?
[ ... ]
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Re: [PATCH v2 1/2] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976
Quoted 27 lines · Daniel Lezcano
Quoted 9 lines · Amit Kucheria
Quoted 8 lines · On Tue, Oct 1, 2019 at 2:27 PM <[email protected]> wrote:
From: AngeloGioacchino Del Regno <[email protected]>
Add support for reading calibrated value from thermistors in MSM8956, MSM8976 and their APQ variants.
Signed-off-by AngeloGioacchino Del Regno <[email protected]>---
[ ... ]
Quoted 4 lines
Quoted 4 lines
drivers/thermal/qcom/tsens-v1.c +3
-1-/* v1.x: qcs404,405 */ +static int calibrate_8976 (struct tsens_priv *priv) +{ +int base0 =0 , base1 =0 , i;Quoted 8 lines
drivers/thermal/qcom/tsens-v1.c static int calibrate_v1(struct tsens_priv *priv) · line 239
Quoted 6 lines
drivers/thermal/qcom/tsens-v1.c +6
-0+u32 p1[11 ], p2[11 ]; +int mode =0 , tmp =0 ; +u32 *qfprom_cdata; + + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" ); +if (IS_ERR (qfprom_cdata))
kfree(qfprom_data)here
Quoted 4 lines
(Assuming s/qfprom_data/qfprom_cdata/)
Where the allocation happen?
nvmem_cell_read() call inside qfprom_read()
/Amit
Re: [PATCH v2 1/2] thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976
Il giorno gio 3 ott 2019 alle ore 16:02 Amit Kucheria <[email protected]> ha scritto:
Quoted 29 lines · Daniel Lezcano
Quoted 27 lines · Amit Kucheria
Quoted 9 lines · On Tue, Oct 1, 2019 at 2:27 PM <[email protected]> wrote:
Quoted 8 lines
From: AngeloGioacchino Del Regno <[email protected]>
Add support for reading calibrated value from thermistors in MSM8956, MSM8976 and their APQ variants.
Signed-off-by AngeloGioacchino Del Regno <[email protected]>---
[ ... ]
Quoted 12 lines
drivers/thermal/qcom/tsens-v1.c static int calibrate_v1(struct tsens_priv *priv) · line 239
Quoted 10 lines
drivers/thermal/qcom/tsens-v1.c +9
-1-/* v1.x: qcs404,405 */ +static int calibrate_8976 (struct tsens_priv *priv) +{ +int base0 =0 , base1 =0 , i; +u32 p1[11 ], p2[11 ]; +int mode =0 , tmp =0 ; +u32 *qfprom_cdata; + + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" ); +if (IS_ERR (qfprom_cdata))
kfree(qfprom_data)here
Quoted 8 lines
Quoted 4 lines
(Assuming s/qfprom_data/qfprom_cdata/)
Where the allocation happen?
nvmem_cell_read()call insideqfprom_read()/Amit
Thanks for the review. I will apply the suggested changes and resend ASAP.
PATCH v2 2/2 dt: thermal: tsens: Document compatible for MSM8976/56
In reply to [email protected]From: AngeloGioacchino Del Regno <[email protected]>
Support for MSM8976 and MSM8956 (having tsens ip version 1) has been added to the qcom tsens driver: document the addition here.
--- Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +2 -0
@@ -29,6 +29,7 @@ properties: - description: v1 of TSENS items: - enum: + - qcom,msm8976-tsens - qcom,qcs404-tsens - const: qcom,tsens-v1
@@ -82,6 +83,7 @@ allOf: enum: - qcom,msm8916-tsens - qcom,msm8974-tsens + - qcom,msm8976-tsens - qcom,qcs404-tsens - qcom,tsens-v0_1 - qcom,tsens-v1
Signature · 1 line
2.21.0