Takashi Iwai 87000f
From 3bf0ea99e2e32b0335106b86d84404cc85bcd113 Mon Sep 17 00:00:00 2001
Takashi Iwai 87000f
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Takashi Iwai 87000f
Date: Sun, 1 Jan 2023 21:40:19 +0200
Takashi Iwai 87000f
Subject: [PATCH] thermal/drivers/tsens: Drop msm8976-specific defines
Takashi Iwai 87000f
Git-commit: 3bf0ea99e2e32b0335106b86d84404cc85bcd113
Takashi Iwai 87000f
Patch-mainline: v6.3-rc1
Takashi Iwai 87000f
References: git-fixes
Takashi Iwai 87000f
Takashi Iwai 87000f
Drop msm8976-specific defines, which duplicate generic ones.
Takashi Iwai 87000f
Takashi Iwai 87000f
Fixes: 0e580290170d ("thermal: qcom: tsens-v1: Add support for MSM8956 and MSM8976")
Takashi Iwai 87000f
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Takashi Iwai 87000f
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Takashi Iwai 87000f
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Takashi Iwai 87000f
Link: https://lore.kernel.org/r/20230101194034.831222-6-dmitry.baryshkov@linaro.org
Takashi Iwai 87000f
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Takashi Iwai 87000f
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 87000f
Takashi Iwai 87000f
---
Takashi Iwai 87000f
 drivers/thermal/qcom/tsens-v1.c | 9 ++-------
Takashi Iwai 87000f
 1 file changed, 2 insertions(+), 7 deletions(-)
Takashi Iwai 87000f
Takashi Iwai 87000f
diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
Takashi Iwai 87000f
index 96ef12d47bff..a7f53966156b 100644
Takashi Iwai 87000f
--- a/drivers/thermal/qcom/tsens-v1.c
Takashi Iwai 87000f
+++ b/drivers/thermal/qcom/tsens-v1.c
Takashi Iwai 87000f
@@ -78,11 +78,6 @@
Takashi Iwai 87000f
 
Takashi Iwai 87000f
 #define MSM8976_CAL_SEL_MASK	0x3
Takashi Iwai 87000f
 
Takashi Iwai 87000f
-#define MSM8976_CAL_DEGC_PT1	30
Takashi Iwai 87000f
-#define MSM8976_CAL_DEGC_PT2	120
Takashi Iwai 87000f
-#define MSM8976_SLOPE_FACTOR	1000
Takashi Iwai 87000f
-#define MSM8976_SLOPE_DEFAULT	3200
Takashi Iwai 87000f
-
Takashi Iwai 87000f
 /* eeprom layout data for qcs404/405 (v1) */
Takashi Iwai 87000f
 #define BASE0_MASK	0x000007f8
Takashi Iwai 87000f
 #define BASE1_MASK	0x0007f800
Takashi Iwai 87000f
@@ -160,8 +155,8 @@ static void compute_intercept_slope_8976(struct tsens_priv *priv,
Takashi Iwai 87000f
 	priv->sensor[10].slope = 3286;
Takashi Iwai 87000f
 
Takashi Iwai 87000f
 	for (i = 0; i < priv->num_sensors; i++) {
Takashi Iwai 87000f
-		priv->sensor[i].offset = (p1[i] * MSM8976_SLOPE_FACTOR) -
Takashi Iwai 87000f
-				(MSM8976_CAL_DEGC_PT1 *
Takashi Iwai 87000f
+		priv->sensor[i].offset = (p1[i] * SLOPE_FACTOR) -
Takashi Iwai 87000f
+				(CAL_DEGC_PT1 *
Takashi Iwai 87000f
 				priv->sensor[i].slope);
Takashi Iwai 87000f
 	}
Takashi Iwai 87000f
 }
Takashi Iwai 87000f
-- 
Takashi Iwai 87000f
2.35.3
Takashi Iwai 87000f