thermal/drivers/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>
Link: https://lore.kernel.org/r/20220818220245.338396-3-robimarko@gmail.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
index ee584e5b07e5671dd7334efce794843cb954e493..4585904fb38002bb25c385be4cedc9e860745480 100644 (file)
--- 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 8cdc3d135d6a85b191e8d07f62a456d928a01d0d..04d012e4f7288221be16cbad8ba411633b9b41ff 100644 (file)
--- 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 a4f561a6e5821c4ffea361e13b5158787119a9c1..1d7f8a80bd13a22446ca03e6e1df1cc3f8edc86f 100644 (file)
--- 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 129cdb247381c40d30b81e7c25ad4fdef32f06df..9babc69bfd22e00b789a941edfcb242e99ff094f 100644 (file)
--- 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 e2511e76f29690009f175ccda2e2c9ea3b5b5c90..f31510489a9abf1c3db31e6d2ef3a9ae05958d44 100644 (file)
--- a/drivers/thermal/qcom/tsens.c
+++ b/drivers/thermal/qcom/tsens.c
@@ -573,8 +573,8 @@ static int tsens_set_trips(struct thermal_zone_device *tz, 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 1678c5e9e60bdac88288321764749d0a9ea5dd7e..8dc21ca0f2a3fcb804c86d94d41cae01c3bb58b8 100644 (file)
--- a/drivers/thermal/qcom/tsens.h
+++ b/drivers/thermal/qcom/tsens.h
@@ -499,6 +499,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;
@@ -508,6 +510,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;
 };
 
 /**