On 29.12.2022 04:00, Dmitry Baryshkov wrote:
> There is no dtsi file for msm8939 in the kernel sources. Drop the
> compatibility with unofficial dtsi and remove support for handling the
> single-cell calibration data on msm8939.
>
> Cc: Shawn Guo <shawn.guo@xxxxxxxxxx>
> Cc: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
Konrad
> drivers/thermal/qcom/tsens-v0_1.c | 26 +-------------------------
> 1 file changed, 1 insertion(+), 25 deletions(-)
>
> diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c
> index 9488416b568c..e89c6f39a3ae 100644
> --- a/drivers/thermal/qcom/tsens-v0_1.c
> +++ b/drivers/thermal/qcom/tsens-v0_1.c
> @@ -150,30 +150,6 @@ static int calibrate_8916(struct tsens_priv *priv)
> return 0;
> }
>
> -static int calibrate_8939(struct tsens_priv *priv)
> -{
> - u32 p1[10], p2[10];
> - 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_8939_nvmem,
> - p1, p2,
> - qfprom_cdata, NULL);
> -
> - compute_intercept_slope(priv, p1, p2, mode);
> - kfree(qfprom_cdata);
> -
> - return 0;
> -}
> -
> static void fixup_8974_points(int mode, u32 *p1, u32 *p2)
> {
> int i;
> @@ -354,7 +330,7 @@ struct tsens_plat_data data_8916 = {
>
> static const struct tsens_ops ops_8939 = {
> .init = init_8939,
> - .calibrate = calibrate_8939,
> + .calibrate = tsens_calibrate_common,
> .get_temp = get_temp_common,
> };
>
