Skip to content

Commit f63bace

Browse files
robimarkoDaniel Lezcano
authored andcommitted
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>
1 parent 4360af3 commit f63bace

6 files changed

Lines changed: 14 additions & 2 deletions

File tree

drivers/thermal/qcom/tsens-8960.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,8 @@ static struct tsens_features tsens_8960_feat = {
273273
.adc = 1,
274274
.srot_split = 0,
275275
.max_sensors = 11,
276+
.trip_min_temp = -40000,
277+
.trip_max_temp = 120000,
276278
};
277279

278280
struct tsens_plat_data data_8960 = {

drivers/thermal/qcom/tsens-v0_1.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -543,6 +543,8 @@ static struct tsens_features tsens_v0_1_feat = {
543543
.adc = 1,
544544
.srot_split = 1,
545545
.max_sensors = 11,
546+
.trip_min_temp = -40000,
547+
.trip_max_temp = 120000,
546548
};
547549

548550
static const struct reg_field tsens_v0_1_regfields[MAX_REGFIELDS] = {

drivers/thermal/qcom/tsens-v1.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,8 @@ static struct tsens_features tsens_v1_feat = {
306306
.adc = 1,
307307
.srot_split = 1,
308308
.max_sensors = 11,
309+
.trip_min_temp = -40000,
310+
.trip_max_temp = 120000,
309311
};
310312

311313
static const struct reg_field tsens_v1_regfields[MAX_REGFIELDS] = {

drivers/thermal/qcom/tsens-v2.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ static struct tsens_features tsens_v2_feat = {
3535
.adc = 0,
3636
.srot_split = 1,
3737
.max_sensors = 16,
38+
.trip_min_temp = -40000,
39+
.trip_max_temp = 120000,
3840
};
3941

4042
static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = {

drivers/thermal/qcom/tsens.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ static int tsens_set_trips(struct thermal_zone_device *tz, int low, int high)
573573
dev_dbg(dev, "[%u] %s: proposed thresholds: (%d:%d)\n",
574574
hw_id, __func__, low, high);
575575

576-
cl_high = clamp_val(high, -40000, 120000);
577-
cl_low = clamp_val(low, -40000, 120000);
576+
cl_high = clamp_val(high, priv->feat->trip_min_temp, priv->feat->trip_max_temp);
577+
cl_low = clamp_val(low, priv->feat->trip_min_temp, priv->feat->trip_max_temp);
578578

579579
high_val = tsens_mC_to_hw(s, cl_high);
580580
low_val = tsens_mC_to_hw(s, cl_low);

drivers/thermal/qcom/tsens.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,8 @@ enum regfield_ids {
499499
* with SROT only being available to secure boot firmware?
500500
* @has_watchdog: does this IP support watchdog functionality?
501501
* @max_sensors: maximum sensors supported by this version of the IP
502+
* @trip_min_temp: minimum trip temperature supported by this version of the IP
503+
* @trip_max_temp: maximum trip temperature supported by this version of the IP
502504
*/
503505
struct tsens_features {
504506
unsigned int ver_major;
@@ -508,6 +510,8 @@ struct tsens_features {
508510
unsigned int srot_split:1;
509511
unsigned int has_watchdog:1;
510512
unsigned int max_sensors;
513+
int trip_min_temp;
514+
int trip_max_temp;
511515
};
512516

513517
/**

0 commit comments

Comments
 (0)