Add msm8939 tsensv0_1 support
cover Add msm8939 tsensv0_1 support
Konrad Dybcio (2):
thermal: qcom: tsens-v0_1: Add support for MSM8939
dt-bindings: tsens: qcom: Document MSM8939 compatible
.../bindings/thermal/qcom-tsens.yaml | 1 + drivers/thermal/qcom/tsens-v0_1.c | 142 +++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 4 files changed, 146 insertions(+), 2 deletions(-)
Signature · 1 line
2.26.1
PATCH 1/2 thermal: qcom: tsens-v0_1: Add support for MSM8939
--- drivers/thermal/qcom/tsens-v0_1.c | 142 +++++++++++++++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 3 files changed, 145 insertions(+), 2 deletions(-)
drivers/thermal/qcom/tsens-v0_1.c +141 -1
@@ -48,6 +48,64 @@#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 +#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_CAL_SEL_MASK 0xc0000000 +#define MSM8939_CAL_SEL_SHIFT 0 + + +#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 5 +#define MSM8939_S3_P1_SHIFT 7 +#define MSM8939_S4_P1_SHIFT 19 +#define MSM8939_S5_P1_SHIFT 8 +#define MSM8939_S6_P1_SHIFT 20 +//yes, 7 is missing in downstream +#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 8 +/* eeprom layout data for 8974 */ #define BASE1_MASK 0xff#define S0_P1_MASK 0x3f00
@@ -189,6 +247,73 @@ 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[11 ], p2[11 ]; +int mode =0 ; +u32 *qfprom_cdata, *qfprom_csel; + + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" ); +if (IS_ERR (qfprom_cdata)) +return PTR_ERR (qfprom_cdata); + + qfprom_csel = (u32 *)qfprom_read (priv->dev,"calib_sel" ); +if (IS_ERR (qfprom_csel)) { +kfree (qfprom_cdata); +return PTR_ERR (qfprom_csel); + } + + mode = (qfprom_csel[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 = (qfprom_cdata[1 ] &MSM8939_BASE1_MASK ) >>MSM8939_BASE1_SHIFT ; + p2[0 ] = (qfprom_cdata[0 ] &MSM8939_S0_P2_MASK ) >>MSM8939_S0_P2_SHIFT ; + p2[1 ] = (qfprom_cdata[0 ] &MSM8939_S1_P2_MASK ) >>MSM8939_S1_P2_SHIFT ; + p2[2 ] = (qfprom_cdata[1 ] &MSM8939_S2_P2_MASK ) >>MSM8939_S2_P2_SHIFT ; + p2[3 ] = (qfprom_cdata[1 ] &MSM8939_S3_P2_MASK ) >>MSM8939_S3_P2_SHIFT ; + p2[4 ] = (qfprom_cdata[1 ] &MSM8939_S4_P2_MASK ) >>MSM8939_S4_P2_SHIFT ; + p2[5 ] = (qfprom_cdata[1 ] &MSM8939_S5_P2_MASK ) >>MSM8939_S5_P2_SHIFT ; + p2[6 ] = (qfprom_cdata[1 ] &MSM8939_S6_P2_MASK ) >>MSM8939_S6_P2_SHIFT ; + p2[7 ] = (qfprom_cdata[1 ] &MSM8939_S7_P2_MASK ) >>MSM8939_S7_P2_SHIFT ; + p2[8 ] = (qfprom_cdata[1 ] &MSM8939_S8_P2_MASK ) >>MSM8939_S8_P2_SHIFT ; + p2[9 ] = (qfprom_cdata[1 ] &MSM8939_S9_P2_MASK_0_4 ) >>MSM8939_S9_P2_SHIFT_0_4 ; + p2[10 ] = (qfprom_cdata[1 ] &MSM8939_S9_P2_MASK_5 ) >>MSM8939_S9_P2_SHIFT_5 ; +for (i =0 ; i < priv->num_sensors; i++) + p2[i] = ((base1 + p2[i]) <<3 ); +/* Fall through */ +case ONE_PT_CALIB2 : + base0 = (qfprom_cdata[0 ] &MSM8939_BASE0_MASK ); + p1[0 ] = (qfprom_cdata[0 ] &MSM8939_S0_P1_MASK ) >>MSM8939_S0_P1_SHIFT ; + p1[1 ] = (qfprom_cdata[0 ] &MSM8939_S1_P1_MASK ) >>MSM8939_S1_P1_SHIFT ; + p1[2 ] = (qfprom_cdata[0 ] &MSM8939_S2_P1_MASK_0_4 ) >>MSM8939_S2_P1_SHIFT_0_4 ; + p1[3 ] = (qfprom_cdata[0 ] &MSM8939_S2_P1_MASK_5 ) >>MSM8939_S2_P1_SHIFT_5 ; + p1[4 ] = (qfprom_cdata[1 ] &MSM8939_S3_P1_MASK ) >>MSM8939_S3_P1_SHIFT ; + p1[5 ] = (qfprom_cdata[1 ] &MSM8939_S4_P1_MASK ) >>MSM8939_S4_P1_SHIFT ; + p1[6 ] = (qfprom_cdata[1 ] &MSM8939_S5_P1_MASK ) >>MSM8939_S5_P1_SHIFT ; + p1[7 ] = (qfprom_cdata[1 ] &MSM8939_S6_P1_MASK ) >>MSM8939_S6_P1_SHIFT ; +//yes, 7 is missing in downstream + p1[8 ] = (qfprom_cdata[1 ] &MSM8939_S8_P1_MASK ) >>MSM8939_S8_P1_SHIFT ; + p1[9 ] = (qfprom_cdata[1 ] &MSM8939_S9_P1_MASK ) >>MSM8939_S9_P1_SHIFT ; +for (i =0 ; i < priv->num_sensors; i++) + p1[i] = (((base0) + p1[i]) <<3 ); +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); +kfree (qfprom_csel); + +return 0 ; +} +static int calibrate_8974 (struct tsens_priv *priv) {int base1 =0 , base2 =0 , i;
@@ -325,7 +450,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 +511,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 }, + + .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
@@ -59,6 +59,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
@@ -590,7 +590,7 @@ irqreturn_t tsens_critical_irq_thread(int irq, void *data);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;
Signature · 1 line
2.26.1
Re: [PATCH 1/2] thermal: qcom: tsens-v0_1: Add support for MSM8939
Quoted 13 lines · Konrad Dybcio
Signed-off-by Konrad Dybcio <[email protected]>--- drivers/thermal/qcom/tsens-v0_1.c | 142 +++++++++++++++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 3 files changed, 145 insertions(+), 2 deletions(-)drivers/thermal/qcom/tsens-v0_1.c +0
-0
drivers/thermal/qcom/tsens-v0_1.c line 54
Quoted 7 lines
drivers/thermal/qcom/tsens-v0_1.c +4
-0@@ -48,6 +48,64 @@#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
Use 0?
Quoted 20 lines
drivers/thermal/qcom/tsens-v0_1.c +20
-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
drivers/thermal/qcom/tsens-v0_1.c line 84
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +10
-0+#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_CAL_SEL_MASK 0xc0000000 +#define MSM8939_CAL_SEL_SHIFT 0 + +
Get rid of extra line.
drivers/thermal/qcom/tsens-v0_1.c line 93
Quoted 9 lines
drivers/thermal/qcom/tsens-v0_1.c +9
-0+#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 5 +#define MSM8939_S3_P1_SHIFT 7 +#define MSM8939_S4_P1_SHIFT 19 +#define MSM8939_S5_P1_SHIFT 8 +#define MSM8939_S6_P1_SHIFT 20 +//yes, 7 is missing in downstream
Use C style comments.
Quoted 31 lines
drivers/thermal/qcom/tsens-v0_1.c +24
-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 8 +/* eeprom layout data for 8974 */ #define BASE1_MASK 0xff#define S0_P1_MASK 0x3f00@@ -189,6 +247,73 @@ 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[11 ], p2[11 ]; +int mode =0 ; +u32 *qfprom_cdata, *qfprom_csel; + + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" ); +if (IS_ERR (qfprom_cdata))
drivers/thermal/qcom/tsens-v0_1.c static int calibrate_8916(struct tsens_priv *priv) · line 268
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +10
-0+return PTR_ERR (qfprom_cdata); + + qfprom_csel = (u32 *)qfprom_read (priv->dev,"calib_sel" ); +if (IS_ERR (qfprom_csel)) { +kfree (qfprom_cdata); +return PTR_ERR (qfprom_csel); + } + + mode = (qfprom_csel[0 ] &MSM8939_CAL_SEL_MASK ) >>MSM8939_CAL_SEL_SHIFT ; +dev_dbg (priv->dev,"calibration mode is %d\n" , mode);
Add an extra line here.
Quoted 18 lines
drivers/thermal/qcom/tsens-v0_1.c +18
-0+switch (mode) { +case TWO_PT_CALIB : + base1 = (qfprom_cdata[1 ] &MSM8939_BASE1_MASK ) >>MSM8939_BASE1_SHIFT ; + p2[0 ] = (qfprom_cdata[0 ] &MSM8939_S0_P2_MASK ) >>MSM8939_S0_P2_SHIFT ; + p2[1 ] = (qfprom_cdata[0 ] &MSM8939_S1_P2_MASK ) >>MSM8939_S1_P2_SHIFT ; + p2[2 ] = (qfprom_cdata[1 ] &MSM8939_S2_P2_MASK ) >>MSM8939_S2_P2_SHIFT ; + p2[3 ] = (qfprom_cdata[1 ] &MSM8939_S3_P2_MASK ) >>MSM8939_S3_P2_SHIFT ; + p2[4 ] = (qfprom_cdata[1 ] &MSM8939_S4_P2_MASK ) >>MSM8939_S4_P2_SHIFT ; + p2[5 ] = (qfprom_cdata[1 ] &MSM8939_S5_P2_MASK ) >>MSM8939_S5_P2_SHIFT ; + p2[6 ] = (qfprom_cdata[1 ] &MSM8939_S6_P2_MASK ) >>MSM8939_S6_P2_SHIFT ; + p2[7 ] = (qfprom_cdata[1 ] &MSM8939_S7_P2_MASK ) >>MSM8939_S7_P2_SHIFT ; + p2[8 ] = (qfprom_cdata[1 ] &MSM8939_S8_P2_MASK ) >>MSM8939_S8_P2_SHIFT ; + p2[9 ] = (qfprom_cdata[1 ] &MSM8939_S9_P2_MASK_0_4 ) >>MSM8939_S9_P2_SHIFT_0_4 ; + p2[10 ] = (qfprom_cdata[1 ] &MSM8939_S9_P2_MASK_5 ) >>MSM8939_S9_P2_SHIFT_5 ; +for (i =0 ; i < priv->num_sensors; i++) + p2[i] = ((base1 + p2[i]) <<3 ); +/* Fall through */ +case ONE_PT_CALIB2 :
drivers/thermal/qcom/tsens-v0_1.c static int calibrate_8916(struct tsens_priv *priv) · line 296
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +10
-0+ base0 = (qfprom_cdata[0 ] &MSM8939_BASE0_MASK ); + p1[0 ] = (qfprom_cdata[0 ] &MSM8939_S0_P1_MASK ) >>MSM8939_S0_P1_SHIFT ; + p1[1 ] = (qfprom_cdata[0 ] &MSM8939_S1_P1_MASK ) >>MSM8939_S1_P1_SHIFT ; + p1[2 ] = (qfprom_cdata[0 ] &MSM8939_S2_P1_MASK_0_4 ) >>MSM8939_S2_P1_SHIFT_0_4 ; + p1[3 ] = (qfprom_cdata[0 ] &MSM8939_S2_P1_MASK_5 ) >>MSM8939_S2_P1_SHIFT_5 ; + p1[4 ] = (qfprom_cdata[1 ] &MSM8939_S3_P1_MASK ) >>MSM8939_S3_P1_SHIFT ; + p1[5 ] = (qfprom_cdata[1 ] &MSM8939_S4_P1_MASK ) >>MSM8939_S4_P1_SHIFT ; + p1[6 ] = (qfprom_cdata[1 ] &MSM8939_S5_P1_MASK ) >>MSM8939_S5_P1_SHIFT ; + p1[7 ] = (qfprom_cdata[1 ] &MSM8939_S6_P1_MASK ) >>MSM8939_S6_P1_SHIFT ; +//yes, 7 is missing in downstream
Use C comment style. Might this be a bug?
Quoted 34 lines
drivers/thermal/qcom/tsens-v0_1.c +21
-1+ p1[8 ] = (qfprom_cdata[1 ] &MSM8939_S8_P1_MASK ) >>MSM8939_S8_P1_SHIFT ; + p1[9 ] = (qfprom_cdata[1 ] &MSM8939_S9_P1_MASK ) >>MSM8939_S9_P1_SHIFT ; +for (i =0 ; i < priv->num_sensors; i++) + p1[i] = (((base0) + p1[i]) <<3 ); +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); +kfree (qfprom_csel); + +return 0 ; +} +static int calibrate_8974 (struct tsens_priv *priv) {int base1 =0 , base2 =0 , i;@@ -325,7 +450,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 +511,21 @@ struct tsens_plat_data data_8916 = { .fields = tsens_v0_1_regfields,
drivers/thermal/qcom/tsens-v0_1.c struct tsens_plat_data data_8916 = { · line 521
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +8
-0}; +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 ,
I think 8939 has 11 sensors. Can you confirm?
drivers/thermal/qcom/tsens-v0_1.c struct tsens_plat_data data_8916 = { · line 523
Quoted 2 lines
drivers/thermal/qcom/tsens-v0_1.c +2
-0+ .ops = &ops_8939, + .hw_ids = (unsigned int []){0, 1, 2, 4, 5, 6, 7, 8, 9 },
And this should be equal to the number of sensors
Quoted 38 lines
drivers/thermal/qcom/tsens-v0_1.c +5
-0+ + .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@@ -59,6 +59,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
-2@@ -590,7 +590,7 @@ irqreturn_t tsens_critical_irq_thread(int irq, void *data);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; --2.26.1
Re: [PATCH 1/2] thermal: qcom: tsens-v0_1: Add support for MSM8939
Thanks for your review. I'll hopefully send a v2 later today.
As for the sensor count, I don't know how many there actually are. I'm an independent dev and don't have access to any documentation and I'm solely basing on what I find in downstream, and I think it's 10, unless mainline expects the _0_4 and _5 to be counted separately.. [1]
I will also make sure to test it again before sending and will give you the results in the v2 cover letter.
pon., 4 maj 2020 o 08:31 Amit Kucheria <[email protected]> napisał(a):
Quoted 236 lines · Konrad Dybcio
Quoted 13 lines
Signed-off-by Konrad Dybcio <[email protected]>--- drivers/thermal/qcom/tsens-v0_1.c | 142 +++++++++++++++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 3 files changed, 145 insertions(+), 2 deletions(-)drivers/thermal/qcom/tsens-v0_1.c +0
-0drivers/thermal/qcom/tsens-v0_1.c line 54
Quoted 7 lines
drivers/thermal/qcom/tsens-v0_1.c +4
-0@@ -48,6 +48,64 @@#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 Use 0?
Quoted 20 lines
drivers/thermal/qcom/tsens-v0_1.c +20
-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 0x000fc000drivers/thermal/qcom/tsens-v0_1.c line 84
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +10
-0+#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_CAL_SEL_MASK 0xc0000000 +#define MSM8939_CAL_SEL_SHIFT 0 + +Get rid of extra line.
drivers/thermal/qcom/tsens-v0_1.c line 93
Quoted 9 lines
drivers/thermal/qcom/tsens-v0_1.c +9
-0+#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 5 +#define MSM8939_S3_P1_SHIFT 7 +#define MSM8939_S4_P1_SHIFT 19 +#define MSM8939_S5_P1_SHIFT 8 +#define MSM8939_S6_P1_SHIFT 20 +//yes, 7 is missing in downstream Use C style comments.
Quoted 31 lines
drivers/thermal/qcom/tsens-v0_1.c +24
-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 8 +/* eeprom layout data for 8974 */ #define BASE1_MASK 0xff#define S0_P1_MASK 0x3f00@@ -189,6 +247,73 @@ 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[11 ], p2[11 ]; +int mode =0 ; +u32 *qfprom_cdata, *qfprom_csel; + + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" ); +if (IS_ERR (qfprom_cdata))drivers/thermal/qcom/tsens-v0_1.c static int calibrate_8916(struct tsens_priv *priv) · line 268
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +10
-0+return PTR_ERR (qfprom_cdata); + + qfprom_csel = (u32 *)qfprom_read (priv->dev,"calib_sel" ); +if (IS_ERR (qfprom_csel)) { +kfree (qfprom_cdata); +return PTR_ERR (qfprom_csel); + } + + mode = (qfprom_csel[0 ] &MSM8939_CAL_SEL_MASK ) >>MSM8939_CAL_SEL_SHIFT ; +dev_dbg (priv->dev,"calibration mode is %d\n" , mode);Add an extra line here.
Quoted 18 lines
drivers/thermal/qcom/tsens-v0_1.c +18
-0+switch (mode) { +case TWO_PT_CALIB : + base1 = (qfprom_cdata[1 ] &MSM8939_BASE1_MASK ) >>MSM8939_BASE1_SHIFT ; + p2[0 ] = (qfprom_cdata[0 ] &MSM8939_S0_P2_MASK ) >>MSM8939_S0_P2_SHIFT ; + p2[1 ] = (qfprom_cdata[0 ] &MSM8939_S1_P2_MASK ) >>MSM8939_S1_P2_SHIFT ; + p2[2 ] = (qfprom_cdata[1 ] &MSM8939_S2_P2_MASK ) >>MSM8939_S2_P2_SHIFT ; + p2[3 ] = (qfprom_cdata[1 ] &MSM8939_S3_P2_MASK ) >>MSM8939_S3_P2_SHIFT ; + p2[4 ] = (qfprom_cdata[1 ] &MSM8939_S4_P2_MASK ) >>MSM8939_S4_P2_SHIFT ; + p2[5 ] = (qfprom_cdata[1 ] &MSM8939_S5_P2_MASK ) >>MSM8939_S5_P2_SHIFT ; + p2[6 ] = (qfprom_cdata[1 ] &MSM8939_S6_P2_MASK ) >>MSM8939_S6_P2_SHIFT ; + p2[7 ] = (qfprom_cdata[1 ] &MSM8939_S7_P2_MASK ) >>MSM8939_S7_P2_SHIFT ; + p2[8 ] = (qfprom_cdata[1 ] &MSM8939_S8_P2_MASK ) >>MSM8939_S8_P2_SHIFT ; + p2[9 ] = (qfprom_cdata[1 ] &MSM8939_S9_P2_MASK_0_4 ) >>MSM8939_S9_P2_SHIFT_0_4 ; + p2[10 ] = (qfprom_cdata[1 ] &MSM8939_S9_P2_MASK_5 ) >>MSM8939_S9_P2_SHIFT_5 ; +for (i =0 ; i < priv->num_sensors; i++) + p2[i] = ((base1 + p2[i]) <<3 ); +/* Fall through */ +case ONE_PT_CALIB2 :drivers/thermal/qcom/tsens-v0_1.c static int calibrate_8916(struct tsens_priv *priv) · line 296
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +10
-0+ base0 = (qfprom_cdata[0 ] &MSM8939_BASE0_MASK ); + p1[0 ] = (qfprom_cdata[0 ] &MSM8939_S0_P1_MASK ) >>MSM8939_S0_P1_SHIFT ; + p1[1 ] = (qfprom_cdata[0 ] &MSM8939_S1_P1_MASK ) >>MSM8939_S1_P1_SHIFT ; + p1[2 ] = (qfprom_cdata[0 ] &MSM8939_S2_P1_MASK_0_4 ) >>MSM8939_S2_P1_SHIFT_0_4 ; + p1[3 ] = (qfprom_cdata[0 ] &MSM8939_S2_P1_MASK_5 ) >>MSM8939_S2_P1_SHIFT_5 ; + p1[4 ] = (qfprom_cdata[1 ] &MSM8939_S3_P1_MASK ) >>MSM8939_S3_P1_SHIFT ; + p1[5 ] = (qfprom_cdata[1 ] &MSM8939_S4_P1_MASK ) >>MSM8939_S4_P1_SHIFT ; + p1[6 ] = (qfprom_cdata[1 ] &MSM8939_S5_P1_MASK ) >>MSM8939_S5_P1_SHIFT ; + p1[7 ] = (qfprom_cdata[1 ] &MSM8939_S6_P1_MASK ) >>MSM8939_S6_P1_SHIFT ; +//yes, 7 is missing in downstream Use C comment style. Might this be a bug?
Quoted 34 lines
drivers/thermal/qcom/tsens-v0_1.c +21
-1+ p1[8 ] = (qfprom_cdata[1 ] &MSM8939_S8_P1_MASK ) >>MSM8939_S8_P1_SHIFT ; + p1[9 ] = (qfprom_cdata[1 ] &MSM8939_S9_P1_MASK ) >>MSM8939_S9_P1_SHIFT ; +for (i =0 ; i < priv->num_sensors; i++) + p1[i] = (((base0) + p1[i]) <<3 ); +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); +kfree (qfprom_csel); + +return 0 ; +} +static int calibrate_8974 (struct tsens_priv *priv) {int base1 =0 , base2 =0 , i;@@ -325,7 +450,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 +511,21 @@ struct tsens_plat_data data_8916 = { .fields = tsens_v0_1_regfields,drivers/thermal/qcom/tsens-v0_1.c struct tsens_plat_data data_8916 = { · line 521
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +8
-0}; +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 ,I think 8939 has 11 sensors. Can you confirm?
drivers/thermal/qcom/tsens-v0_1.c struct tsens_plat_data data_8916 = { · line 523
Quoted 2 lines
drivers/thermal/qcom/tsens-v0_1.c +2
-0+ .ops = &ops_8939, + .hw_ids = (unsigned int []){0, 1, 2, 4, 5, 6, 7, 8, 9 },And this should be equal to the number of sensors
Quoted 38 lines
drivers/thermal/qcom/tsens-v0_1.c +5
-0+ + .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@@ -59,6 +59,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
-2@@ -590,7 +590,7 @@ irqreturn_t tsens_critical_irq_thread(int irq, void *data);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; --2.26.1
Re: [PATCH 1/2] thermal: qcom: tsens-v0_1: Add support for MSM8939
In reply to Konrad DybcioQuoted 1 line · Konrad Dybcio
Signed-off-by Konrad Dybcio <[email protected]>
For the record, I'm working my version of msm8939 tsens driver support, and I would highlight the things that differ from this patch.
Quoted 11 lines
--- drivers/thermal/qcom/tsens-v0_1.c | 142 +++++++++++++++++++++++++++++- drivers/thermal/qcom/tsens.c | 3 + drivers/thermal/qcom/tsens.h | 2 +- 3 files changed, 145 insertions(+), 2 deletions(-)drivers/thermal/qcom/tsens-v0_1.c +0
-0
drivers/thermal/qcom/tsens-v0_1.c line 52
Quoted 5 lines
drivers/thermal/qcom/tsens-v0_1.c +2
-0@@ -48,6 +48,64 @@#define MSM8916_CAL_SEL_MASK 0xe0000000#define MSM8916_CAL_SEL_SHIFT 29 +/* eeprom layout data for 8939 */ +#define MSM8939_BASE0_MASK 0x000000ff
Tabs rather than spaces are used for indentation.
drivers/thermal/qcom/tsens-v0_1.c line 54
Quoted 2 lines
drivers/thermal/qcom/tsens-v0_1.c +2
-0+#define MSM8939_BASE1_MASK 0xff000000 +#define MSM8939_BASE0_SHIFT
This shift is 0.
drivers/thermal/qcom/tsens-v0_1.c line 60
Quoted 6 lines
drivers/thermal/qcom/tsens-v0_1.c +6
-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
This mask define is contradicting to MSM8939_S2_P1_SHIFT_5, and needs to be confirmed.
Quoted 9 lines
drivers/thermal/qcom/tsens-v0_1.c +9
-0+#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
drivers/thermal/qcom/tsens-v0_1.c line 79
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +10
-0+#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
It's contradicting to MSM8939_S9_P2_SHIFT_5, and needs to be confirmed.
drivers/thermal/qcom/tsens-v0_1.c line 81
Quoted 2 lines
drivers/thermal/qcom/tsens-v0_1.c +2
-0+ +#define MSM8939_CAL_SEL_MASK 0xc0000000
Per downstream kernel, this mask is 0x7.
drivers/thermal/qcom/tsens-v0_1.c line 93
Quoted 12 lines
drivers/thermal/qcom/tsens-v0_1.c +12
-0+#define MSM8939_CAL_SEL_SHIFT 0 + + +#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 5 +#define MSM8939_S3_P1_SHIFT 7 +#define MSM8939_S4_P1_SHIFT 19 +#define MSM8939_S5_P1_SHIFT 8 +#define MSM8939_S6_P1_SHIFT 20 +//yes, 7 is missing in downstream
The shift is not missing but just 0.
Quoted 19 lines
drivers/thermal/qcom/tsens-v0_1.c +15
-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 8 +/* eeprom layout data for 8974 */ #define BASE1_MASK 0xff#define S0_P1_MASK 0x3f00
drivers/thermal/qcom/tsens-v0_1.c static int calibrate_8916(struct tsens_priv *priv) · line 253
Quoted 7 lines
drivers/thermal/qcom/tsens-v0_1.c +4
-0@@ -189,6 +247,73 @@ 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[11 ], p2[11 ];
MSM8939 gets 10 sensors, so the arrays should be [10].
drivers/thermal/qcom/tsens-v0_1.c static int calibrate_8916(struct tsens_priv *priv) · line 265
Quoted 12 lines
drivers/thermal/qcom/tsens-v0_1.c +12
-0+int mode =0 ; +u32 *qfprom_cdata, *qfprom_csel; + + qfprom_cdata = (u32 *)qfprom_read (priv->dev,"calib" ); +if (IS_ERR (qfprom_cdata)) +return PTR_ERR (qfprom_cdata); + + qfprom_csel = (u32 *)qfprom_read (priv->dev,"calib_sel" ); +if (IS_ERR (qfprom_csel)) { +kfree (qfprom_cdata); +return PTR_ERR (qfprom_csel); + }
'calib_sel' is not separate from 'calib' bits on MSM8939. I chose to read nvmem out as one go and map them to calibration data as below, per downstream kernel.
/* 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;
We should support MSM8939 v3, as that's the mass production revision.
Quoted 7 lines
drivers/thermal/qcom/tsens-v0_1.c +7
-0+ + mode = (qfprom_csel[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 = (qfprom_cdata[1 ] &MSM8939_BASE1_MASK ) >>MSM8939_BASE1_SHIFT ; + p2[0 ] = (qfprom_cdata[0 ] &MSM8939_S0_P2_MASK ) >>MSM8939_S0_P2_SHIFT ;
drivers/thermal/qcom/tsens-v0_1.c static int calibrate_8916(struct tsens_priv *priv) · line 282
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +10
-0+ p2[1 ] = (qfprom_cdata[0 ] &MSM8939_S1_P2_MASK ) >>MSM8939_S1_P2_SHIFT ; + p2[2 ] = (qfprom_cdata[1 ] &MSM8939_S2_P2_MASK ) >>MSM8939_S2_P2_SHIFT ; + p2[3 ] = (qfprom_cdata[1 ] &MSM8939_S3_P2_MASK ) >>MSM8939_S3_P2_SHIFT ; + p2[4 ] = (qfprom_cdata[1 ] &MSM8939_S4_P2_MASK ) >>MSM8939_S4_P2_SHIFT ; + p2[5 ] = (qfprom_cdata[1 ] &MSM8939_S5_P2_MASK ) >>MSM8939_S5_P2_SHIFT ; + p2[6 ] = (qfprom_cdata[1 ] &MSM8939_S6_P2_MASK ) >>MSM8939_S6_P2_SHIFT ; + p2[7 ] = (qfprom_cdata[1 ] &MSM8939_S7_P2_MASK ) >>MSM8939_S7_P2_SHIFT ; + p2[8 ] = (qfprom_cdata[1 ] &MSM8939_S8_P2_MASK ) >>MSM8939_S8_P2_SHIFT ; + p2[9 ] = (qfprom_cdata[1 ] &MSM8939_S9_P2_MASK_0_4 ) >>MSM8939_S9_P2_SHIFT_0_4 ; + p2[10 ] = (qfprom_cdata[1 ] &MSM8939_S9_P2_MASK_5 ) >>MSM8939_S9_P2_SHIFT_5 ;
These do not really match downstream kernel. My version look like:
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;
drivers/thermal/qcom/tsens-v0_1.c static int calibrate_8916(struct tsens_priv *priv) · line 284
Quoted 2 lines
drivers/thermal/qcom/tsens-v0_1.c +2
-0+for (i =0 ; i < priv->num_sensors; i++) + p2[i] = ((base1 + p2[i]) <<3 );
The left shift should be 2 per downstream kernel.
drivers/thermal/qcom/tsens-v0_1.c static int calibrate_8916(struct tsens_priv *priv) · line 296
Quoted 12 lines
drivers/thermal/qcom/tsens-v0_1.c +12
-0+/* Fall through */ +case ONE_PT_CALIB2 : + base0 = (qfprom_cdata[0 ] &MSM8939_BASE0_MASK ); + p1[0 ] = (qfprom_cdata[0 ] &MSM8939_S0_P1_MASK ) >>MSM8939_S0_P1_SHIFT ; + p1[1 ] = (qfprom_cdata[0 ] &MSM8939_S1_P1_MASK ) >>MSM8939_S1_P1_SHIFT ; + p1[2 ] = (qfprom_cdata[0 ] &MSM8939_S2_P1_MASK_0_4 ) >>MSM8939_S2_P1_SHIFT_0_4 ; + p1[3 ] = (qfprom_cdata[0 ] &MSM8939_S2_P1_MASK_5 ) >>MSM8939_S2_P1_SHIFT_5 ; + p1[4 ] = (qfprom_cdata[1 ] &MSM8939_S3_P1_MASK ) >>MSM8939_S3_P1_SHIFT ; + p1[5 ] = (qfprom_cdata[1 ] &MSM8939_S4_P1_MASK ) >>MSM8939_S4_P1_SHIFT ; + p1[6 ] = (qfprom_cdata[1 ] &MSM8939_S5_P1_MASK ) >>MSM8939_S5_P1_SHIFT ; + p1[7 ] = (qfprom_cdata[1 ] &MSM8939_S6_P1_MASK ) >>MSM8939_S6_P1_SHIFT ; +//yes, 7 is missing in downstream
Not really.
Quoted 36 lines
drivers/thermal/qcom/tsens-v0_1.c +21
-1+ p1[8 ] = (qfprom_cdata[1 ] &MSM8939_S8_P1_MASK ) >>MSM8939_S8_P1_SHIFT ; + p1[9 ] = (qfprom_cdata[1 ] &MSM8939_S9_P1_MASK ) >>MSM8939_S9_P1_SHIFT ; +for (i =0 ; i < priv->num_sensors; i++) + p1[i] = (((base0) + p1[i]) <<3 ); +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); +kfree (qfprom_csel); + +return 0 ; +} +static int calibrate_8974 (struct tsens_priv *priv) {int base1 =0 , base2 =0 , i;@@ -325,7 +450,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 +511,21 @@ struct tsens_plat_data data_8916 = { .fields = tsens_v0_1_regfields, };
drivers/thermal/qcom/tsens-v0_1.c struct tsens_plat_data data_8916 = { · line 523
Quoted 10 lines
drivers/thermal/qcom/tsens-v0_1.c +10
-0+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 },
Should be { 0, 1, 2, 4, 5, 6, 7, 8, 9, 10 }.
Shawn
Quoted 38 lines
drivers/thermal/qcom/tsens-v0_1.c +5
-0+ + .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@@ -59,6 +59,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@@ -590,7 +590,7 @@ irqreturn_t tsens_critical_irq_thread(int irq, void *data);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;Signature · 1 line
2.26.1
Re: [PATCH 1/2] thermal: qcom: tsens-v0_1: Add support for MSM8939
Hi Shawn,
Thanks for your review.
Quoted 2 lines
For the record, I'm working my version of msm8939 tsens driver support, and I would highlight the things that differ from this patch.
I would be absolutely happy if you superseded that patch with your one, as I'm currently working on sdm630.
Otherwise, thanks for pointing out the stuff I got wrong in the first place.
Regards
Konrad
PATCH 2/2 dt-bindings: tsens: qcom: Document MSM8939 compatible
In reply to Konrad Dybcio--- Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +1 -0
@@ -23,6 +23,7 @@ properties: items: - enum: - qcom,msm8916-tsens + - qcom,msm8939-tsens - qcom,msm8974-tsens - const: qcom,tsens-v0_1
Signature · 1 line
2.26.1
Re: [PATCH 2/2] dt-bindings: tsens: qcom: Document MSM8939 compatible
Quoted 2 lines · Konrad Dybcio
Signed-off-by Konrad Dybcio <[email protected]>
Quoted 19 lines
--- Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 1 + 1 file changed, 1 insertion(+)Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +1
-1@@ -23,6 +23,7 @@ properties: items: - enum: - qcom,msm8916-tsens + - qcom,msm8939-tsens - qcom,msm8974-tsens - const: qcom,tsens-v0_1 --2.26.1
Re: [PATCH 2/2] dt-bindings: tsens: qcom: Document MSM8939 compatible
In reply to Konrad DybcioQuoted 5 lines · Konrad Dybcio
Signed-off-by Konrad Dybcio <[email protected]>--- Documentation/devicetree/bindings/thermal/qcom-tsens.yaml | 1 + 1 file changed, 1 insertion(+)