| Message ID | 20230315103950.2679317-2-stephan.gerhold@kernkonzept.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | thermal: qcom: tsens: Fix MDM9607, add MSM8909 | expand |
On 15.03.2023 11:39, Stephan Gerhold wrote: > The old single-cell parsing code was removed for MSM8939, MDM9607 and > MSM8976 but for some reason the structs defining the bit positions etc > were kept around (unused). Drop them now. > > Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Fixes: 51d78b8b1beb ("thermal/drivers/tsens: Drop single-cell code for mdm9607") > Fixes: dfadb4599ab0 ("thermal/drivers/tsens: Drop single-cell code for msm8939") > Fixes: 3a908971f7cb ("thermal/drivers/tsens: Drop single-cell code for msm8976/msm8956") > Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com> > --- > Changes in v3: None > Changes in v2: New patch > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/thermal/qcom/tsens-v0_1.c | 36 ------------------------------- > drivers/thermal/qcom/tsens-v1.c | 22 ------------------- > 2 files changed, 58 deletions(-) > > diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c > index e89c6f39a3ae..106d26076e3f 100644 > --- a/drivers/thermal/qcom/tsens-v0_1.c > +++ b/drivers/thermal/qcom/tsens-v0_1.c > @@ -39,26 +39,6 @@ struct tsens_legacy_calibration_format tsens_8916_nvmem = { > }, > }; > > -struct tsens_legacy_calibration_format tsens_8939_nvmem = { > - .base_len = 8, > - .base_shift = 2, > - .sp_len = 6, > - .mode = { 12, 0 }, > - .invalid = { 12, 2 }, > - .base = { { 0, 0 }, { 1, 24 } }, > - .sp = { > - { { 12, 3 }, { 12, 9 } }, > - { { 12, 15 }, { 12, 21 } }, > - { { 12, 27 }, { 13, 1 } }, > - { { 13, 7 }, { 13, 13 } }, > - { { 13, 19 }, { 13, 25 } }, > - { { 0, 8 }, { 0, 14 } }, > - { { 0, 20 }, { 0, 26 } }, > - { { 1, 0 }, { 1, 6 } }, > - { { 1, 12 }, { 1, 18 } }, > - }, > -}; > - > struct tsens_legacy_calibration_format tsens_8974_nvmem = { > .base_len = 8, > .base_shift = 2, > @@ -103,22 +83,6 @@ struct tsens_legacy_calibration_format tsens_8974_backup_nvmem = { > }, > }; > > -struct tsens_legacy_calibration_format tsens_9607_nvmem = { > - .base_len = 8, > - .base_shift = 2, > - .sp_len = 6, > - .mode = { 2, 20 }, > - .invalid = { 2, 22 }, > - .base = { { 0, 0 }, { 2, 12 } }, > - .sp = { > - { { 0, 8 }, { 0, 14 } }, > - { { 0, 20 }, { 0, 26 } }, > - { { 1, 0 }, { 1, 6 } }, > - { { 1, 12 }, { 1, 18 } }, > - { { 2, 0 }, { 2, 6 } }, > - }, > -}; > - > static int calibrate_8916(struct tsens_priv *priv) > { > u32 p1[5], p2[5]; > diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c > index b822a426066d..51322430f1fe 100644 > --- a/drivers/thermal/qcom/tsens-v1.c > +++ b/drivers/thermal/qcom/tsens-v1.c > @@ -42,28 +42,6 @@ struct tsens_legacy_calibration_format tsens_qcs404_nvmem = { > }, > }; > > -struct tsens_legacy_calibration_format tsens_8976_nvmem = { > - .base_len = 8, > - .base_shift = 2, > - .sp_len = 6, > - .mode = { 4, 0 }, > - .invalid = { 4, 2 }, > - .base = { { 0, 0 }, { 2, 8 } }, > - .sp = { > - { { 0, 8 }, { 0, 14 } }, > - { { 0, 20 }, { 0, 26 } }, > - { { 1, 0 }, { 1, 6 } }, > - { { 1, 12 }, { 1, 18 } }, > - { { 2, 8 }, { 2, 14 } }, > - { { 2, 20 }, { 2, 26 } }, > - { { 3, 0 }, { 3, 6 } }, > - { { 3, 12 }, { 3, 18 } }, > - { { 4, 2 }, { 4, 9 } }, > - { { 4, 14 }, { 4, 21 } }, > - { { 4, 26 }, { 5, 1 } }, > - }, > -}; > - > static int calibrate_v1(struct tsens_priv *priv) > { > u32 p1[10], p2[10];
diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c index e89c6f39a3ae..106d26076e3f 100644 --- a/drivers/thermal/qcom/tsens-v0_1.c +++ b/drivers/thermal/qcom/tsens-v0_1.c @@ -39,26 +39,6 @@ struct tsens_legacy_calibration_format tsens_8916_nvmem = { }, }; -struct tsens_legacy_calibration_format tsens_8939_nvmem = { - .base_len = 8, - .base_shift = 2, - .sp_len = 6, - .mode = { 12, 0 }, - .invalid = { 12, 2 }, - .base = { { 0, 0 }, { 1, 24 } }, - .sp = { - { { 12, 3 }, { 12, 9 } }, - { { 12, 15 }, { 12, 21 } }, - { { 12, 27 }, { 13, 1 } }, - { { 13, 7 }, { 13, 13 } }, - { { 13, 19 }, { 13, 25 } }, - { { 0, 8 }, { 0, 14 } }, - { { 0, 20 }, { 0, 26 } }, - { { 1, 0 }, { 1, 6 } }, - { { 1, 12 }, { 1, 18 } }, - }, -}; - struct tsens_legacy_calibration_format tsens_8974_nvmem = { .base_len = 8, .base_shift = 2, @@ -103,22 +83,6 @@ struct tsens_legacy_calibration_format tsens_8974_backup_nvmem = { }, }; -struct tsens_legacy_calibration_format tsens_9607_nvmem = { - .base_len = 8, - .base_shift = 2, - .sp_len = 6, - .mode = { 2, 20 }, - .invalid = { 2, 22 }, - .base = { { 0, 0 }, { 2, 12 } }, - .sp = { - { { 0, 8 }, { 0, 14 } }, - { { 0, 20 }, { 0, 26 } }, - { { 1, 0 }, { 1, 6 } }, - { { 1, 12 }, { 1, 18 } }, - { { 2, 0 }, { 2, 6 } }, - }, -}; - static int calibrate_8916(struct tsens_priv *priv) { u32 p1[5], p2[5]; diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c index b822a426066d..51322430f1fe 100644 --- a/drivers/thermal/qcom/tsens-v1.c +++ b/drivers/thermal/qcom/tsens-v1.c @@ -42,28 +42,6 @@ struct tsens_legacy_calibration_format tsens_qcs404_nvmem = { }, }; -struct tsens_legacy_calibration_format tsens_8976_nvmem = { - .base_len = 8, - .base_shift = 2, - .sp_len = 6, - .mode = { 4, 0 }, - .invalid = { 4, 2 }, - .base = { { 0, 0 }, { 2, 8 } }, - .sp = { - { { 0, 8 }, { 0, 14 } }, - { { 0, 20 }, { 0, 26 } }, - { { 1, 0 }, { 1, 6 } }, - { { 1, 12 }, { 1, 18 } }, - { { 2, 8 }, { 2, 14 } }, - { { 2, 20 }, { 2, 26 } }, - { { 3, 0 }, { 3, 6 } }, - { { 3, 12 }, { 3, 18 } }, - { { 4, 2 }, { 4, 9 } }, - { { 4, 14 }, { 4, 21 } }, - { { 4, 26 }, { 5, 1 } }, - }, -}; - static int calibrate_v1(struct tsens_priv *priv) { u32 p1[10], p2[10];
The old single-cell parsing code was removed for MSM8939, MDM9607 and MSM8976 but for some reason the structs defining the bit positions etc were kept around (unused). Drop them now. Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Fixes: 51d78b8b1beb ("thermal/drivers/tsens: Drop single-cell code for mdm9607") Fixes: dfadb4599ab0 ("thermal/drivers/tsens: Drop single-cell code for msm8939") Fixes: 3a908971f7cb ("thermal/drivers/tsens: Drop single-cell code for msm8976/msm8956") Signed-off-by: Stephan Gerhold <stephan.gerhold@kernkonzept.com> --- Changes in v3: None Changes in v2: New patch --- drivers/thermal/qcom/tsens-v0_1.c | 36 ------------------------------- drivers/thermal/qcom/tsens-v1.c | 22 ------------------- 2 files changed, 58 deletions(-)