| Message ID | 20221229030106.3303205-15-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | thermal/drivers/tsens: specify nvmem cells in DT rather than parsing them manually | expand |
On 29.12.2022 04:01, Dmitry Baryshkov wrote: > There is no dtsi file for msm8976 in the kernel sources. Drop the > compatibility with unofficial dtsi and remove support for handling the > single-cell calibration data on msm8976. > > Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > drivers/thermal/qcom/tsens-v1.c | 29 ++--------------------------- > 1 file changed, 2 insertions(+), 27 deletions(-) > > diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c > index 6d1ea430f90b..b822a426066d 100644 > --- a/drivers/thermal/qcom/tsens-v1.c > +++ b/drivers/thermal/qcom/tsens-v1.c > @@ -88,31 +88,6 @@ static int calibrate_v1(struct tsens_priv *priv) > return 0; > } > > -static int calibrate_8976(struct tsens_priv *priv) > -{ > - u32 p1[11], p2[11]; > - u32 *qfprom_cdata; > - int mode, ret; > - > - ret = tsens_calibrate_common(priv); > - if (!ret) > - return 0; > - > - qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); > - if (IS_ERR(qfprom_cdata)) > - return PTR_ERR(qfprom_cdata); > - > - mode = tsens_read_calibration_legacy(priv, &tsens_8976_nvmem, > - p1, p2, > - qfprom_cdata, NULL); > - > - > - compute_intercept_slope(priv, p1, p2, mode); > - kfree(qfprom_cdata); > - > - return 0; > -} > - > /* v1.x: msm8956,8976,qcs404,405 */ > > static struct tsens_features tsens_v1_feat = { > @@ -211,7 +186,7 @@ struct tsens_plat_data data_tsens_v1 = { > > static const struct tsens_ops ops_8956 = { > .init = init_8956, > - .calibrate = calibrate_8976, > + .calibrate = tsens_calibrate_common, > .get_temp = get_temp_tsens_valid, > }; > > @@ -224,7 +199,7 @@ struct tsens_plat_data data_8956 = { > > static const struct tsens_ops ops_8976 = { > .init = init_common, > - .calibrate = calibrate_8976, > + .calibrate = tsens_calibrate_common, > .get_temp = get_temp_tsens_valid, > }; >
diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c index 6d1ea430f90b..b822a426066d 100644 --- a/drivers/thermal/qcom/tsens-v1.c +++ b/drivers/thermal/qcom/tsens-v1.c @@ -88,31 +88,6 @@ static int calibrate_v1(struct tsens_priv *priv) return 0; } -static int calibrate_8976(struct tsens_priv *priv) -{ - u32 p1[11], p2[11]; - u32 *qfprom_cdata; - int mode, ret; - - ret = tsens_calibrate_common(priv); - if (!ret) - return 0; - - qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib"); - if (IS_ERR(qfprom_cdata)) - return PTR_ERR(qfprom_cdata); - - mode = tsens_read_calibration_legacy(priv, &tsens_8976_nvmem, - p1, p2, - qfprom_cdata, NULL); - - - compute_intercept_slope(priv, p1, p2, mode); - kfree(qfprom_cdata); - - return 0; -} - /* v1.x: msm8956,8976,qcs404,405 */ static struct tsens_features tsens_v1_feat = { @@ -211,7 +186,7 @@ struct tsens_plat_data data_tsens_v1 = { static const struct tsens_ops ops_8956 = { .init = init_8956, - .calibrate = calibrate_8976, + .calibrate = tsens_calibrate_common, .get_temp = get_temp_tsens_valid, }; @@ -224,7 +199,7 @@ struct tsens_plat_data data_8956 = { static const struct tsens_ops ops_8976 = { .init = init_common, - .calibrate = calibrate_8976, + .calibrate = tsens_calibrate_common, .get_temp = get_temp_tsens_valid, };
There is no dtsi file for msm8976 in the kernel sources. Drop the compatibility with unofficial dtsi and remove support for handling the single-cell calibration data on msm8976. Cc: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/thermal/qcom/tsens-v1.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-)