mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
116 lines
4.1 KiB
Diff
116 lines
4.1 KiB
Diff
From f035a370b770831f1c4a5d5b5b4387391ee3f71a Mon Sep 17 00:00:00 2001
|
|
From: Robert Marko <robimarko@gmail.com>
|
|
Date: Thu, 28 Apr 2022 19:06:29 +0200
|
|
Subject: [PATCH 119/137] drivers: thermal: tsens: allow configuring min and
|
|
max trips
|
|
|
|
IPQ8074 and IPQ6018 dont support negative trip temperatures and support
|
|
up to 204 degrees C as the max trip temperature.
|
|
|
|
So, instead of always setting the -40 as min and 120 degrees C as max
|
|
allow it to be configured as part of the features.
|
|
|
|
Signed-off-by: Robert Marko <robimarko@gmail.com>
|
|
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
|
---
|
|
drivers/thermal/qcom/tsens-8960.c | 2 ++
|
|
drivers/thermal/qcom/tsens-v0_1.c | 2 ++
|
|
drivers/thermal/qcom/tsens-v1.c | 2 ++
|
|
drivers/thermal/qcom/tsens-v2.c | 2 ++
|
|
drivers/thermal/qcom/tsens.c | 4 ++--
|
|
drivers/thermal/qcom/tsens.h | 4 ++++
|
|
6 files changed, 14 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
|
|
index ee584e5b07e5..4585904fb380 100644
|
|
--- a/drivers/thermal/qcom/tsens-8960.c
|
|
+++ b/drivers/thermal/qcom/tsens-8960.c
|
|
@@ -273,6 +273,8 @@ static struct tsens_features tsens_8960_feat = {
|
|
.adc = 1,
|
|
.srot_split = 0,
|
|
.max_sensors = 11,
|
|
+ .trip_min_temp = -40000,
|
|
+ .trip_max_temp = 120000,
|
|
};
|
|
|
|
struct tsens_plat_data data_8960 = {
|
|
diff --git a/drivers/thermal/qcom/tsens-v0_1.c b/drivers/thermal/qcom/tsens-v0_1.c
|
|
index 6effb822bf3c..2c203ff374e6 100644
|
|
--- a/drivers/thermal/qcom/tsens-v0_1.c
|
|
+++ b/drivers/thermal/qcom/tsens-v0_1.c
|
|
@@ -543,6 +543,8 @@ static struct tsens_features tsens_v0_1_feat = {
|
|
.adc = 1,
|
|
.srot_split = 1,
|
|
.max_sensors = 11,
|
|
+ .trip_min_temp = -40000,
|
|
+ .trip_max_temp = 120000,
|
|
};
|
|
|
|
static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = {
|
|
diff --git a/drivers/thermal/qcom/tsens-v1.c b/drivers/thermal/qcom/tsens-v1.c
|
|
index a4f561a6e582..1d7f8a80bd13 100644
|
|
--- a/drivers/thermal/qcom/tsens-v1.c
|
|
+++ b/drivers/thermal/qcom/tsens-v1.c
|
|
@@ -306,6 +306,8 @@ static struct tsens_features tsens_v1_feat = {
|
|
.adc = 1,
|
|
.srot_split = 1,
|
|
.max_sensors = 11,
|
|
+ .trip_min_temp = -40000,
|
|
+ .trip_max_temp = 120000,
|
|
};
|
|
|
|
static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {
|
|
diff --git a/drivers/thermal/qcom/tsens-v2.c b/drivers/thermal/qcom/tsens-v2.c
|
|
index 129cdb247381..9babc69bfd22 100644
|
|
--- a/drivers/thermal/qcom/tsens-v2.c
|
|
+++ b/drivers/thermal/qcom/tsens-v2.c
|
|
@@ -35,6 +35,8 @@ static struct tsens_features tsens_v2_feat = {
|
|
.adc = 0,
|
|
.srot_split = 1,
|
|
.max_sensors = 16,
|
|
+ .trip_min_temp = -40000,
|
|
+ .trip_max_temp = 120000,
|
|
};
|
|
|
|
static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = {
|
|
diff --git a/drivers/thermal/qcom/tsens.c b/drivers/thermal/qcom/tsens.c
|
|
index 11172afbc5da..e11861581970 100644
|
|
--- a/drivers/thermal/qcom/tsens.c
|
|
+++ b/drivers/thermal/qcom/tsens.c
|
|
@@ -572,8 +572,8 @@ static int tsens_set_trips(void *_sensor, int low, int high)
|
|
dev_dbg(dev, "[%u] %s: proposed thresholds: (%d:%d)\n",
|
|
hw_id, __func__, low, high);
|
|
|
|
- cl_high = clamp_val(high, -40000, 120000);
|
|
- cl_low = clamp_val(low, -40000, 120000);
|
|
+ cl_high = clamp_val(high, priv->feat->trip_min_temp, priv->feat->trip_max_temp);
|
|
+ cl_low = clamp_val(low, priv->feat->trip_min_temp, priv->feat->trip_max_temp);
|
|
|
|
high_val = tsens_mC_to_hw(s, cl_high);
|
|
low_val = tsens_mC_to_hw(s, cl_low);
|
|
diff --git a/drivers/thermal/qcom/tsens.h b/drivers/thermal/qcom/tsens.h
|
|
index 4614177944d6..747004476347 100644
|
|
--- a/drivers/thermal/qcom/tsens.h
|
|
+++ b/drivers/thermal/qcom/tsens.h
|
|
@@ -501,6 +501,8 @@ enum regfield_ids {
|
|
* with SROT only being available to secure boot firmware?
|
|
* @has_watchdog: does this IP support watchdog functionality?
|
|
* @max_sensors: maximum sensors supported by this version of the IP
|
|
+ * @trip_min_temp: minimum trip temperature supported by this version of the IP
|
|
+ * @trip_max_temp: maximum trip temperature supported by this version of the IP
|
|
*/
|
|
struct tsens_features {
|
|
unsigned int ver_major;
|
|
@@ -510,6 +512,8 @@ struct tsens_features {
|
|
unsigned int srot_split:1;
|
|
unsigned int has_watchdog:1;
|
|
unsigned int max_sensors;
|
|
+ int trip_min_temp;
|
|
+ int trip_max_temp;
|
|
};
|
|
|
|
/**
|
|
--
|
|
2.37.2
|
|
|