Skip to content

Commit 554bca3

Browse files
npitredlezcano
authored andcommitted
thermal/drivers/mediatek/lvts_thermal: Remove .hw_tshut_temp
All the .hw_tshut_temp instances are initialized with the same value. Let's remove those and use a common definition instead. If ever a different value must be used in the future then an override parameter could be added back. Signed-off-by: Nicolas Pitre <[email protected]> Signed-off-by: Daniel Lezcano <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 62194e6 commit 554bca3

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

drivers/thermal/mediatek/lvts_thermal.c

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,7 @@
9191
#define LVTS_MSR_READ_TIMEOUT_US 400
9292
#define LVTS_MSR_READ_WAIT_US (LVTS_MSR_READ_TIMEOUT_US / 2)
9393

94-
#define LVTS_HW_SHUTDOWN_MT7988 105000
95-
#define LVTS_HW_SHUTDOWN_MT8192 105000
96-
#define LVTS_HW_SHUTDOWN_MT8195 105000
94+
#define LVTS_HW_TSHUT_TEMP 105000
9795

9896
#define LVTS_MINIMUM_THRESHOLD 20000
9997

@@ -107,7 +105,6 @@ struct lvts_sensor_data {
107105
struct lvts_ctrl_data {
108106
struct lvts_sensor_data lvts_sensor[LVTS_SENSOR_MAX];
109107
int cal_offset[LVTS_SENSOR_MAX];
110-
int hw_tshut_temp;
111108
int num_lvts_sensor;
112109
int offset;
113110
int mode;
@@ -801,7 +798,7 @@ static int lvts_ctrl_init(struct device *dev, struct lvts_domain *lvts_td,
801798
* after initializing the calibration.
802799
*/
803800
lvts_ctrl[i].hw_tshut_raw_temp =
804-
lvts_temp_to_raw(lvts_data->lvts_ctrl[i].hw_tshut_temp,
801+
lvts_temp_to_raw(LVTS_HW_TSHUT_TEMP,
805802
lvts_data->temp_factor);
806803

807804
lvts_ctrl[i].low_thresh = INT_MIN;
@@ -1311,7 +1308,6 @@ static const struct lvts_ctrl_data mt7988_lvts_ap_data_ctrl[] = {
13111308
},
13121309
.num_lvts_sensor = 4,
13131310
.offset = 0x0,
1314-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT7988,
13151311
},
13161312
{
13171313
.cal_offset = { 0x14, 0x18, 0x1c, 0x20 },
@@ -1323,7 +1319,6 @@ static const struct lvts_ctrl_data mt7988_lvts_ap_data_ctrl[] = {
13231319
},
13241320
.num_lvts_sensor = 4,
13251321
.offset = 0x100,
1326-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT7988,
13271322
}
13281323
};
13291324

@@ -1368,7 +1363,6 @@ static const struct lvts_ctrl_data mt8192_lvts_mcu_data_ctrl[] = {
13681363
},
13691364
.num_lvts_sensor = 2,
13701365
.offset = 0x0,
1371-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8192,
13721366
.mode = LVTS_MSR_FILTERED_MODE,
13731367
},
13741368
{
@@ -1379,7 +1373,6 @@ static const struct lvts_ctrl_data mt8192_lvts_mcu_data_ctrl[] = {
13791373
},
13801374
.num_lvts_sensor = 2,
13811375
.offset = 0x100,
1382-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8192,
13831376
.mode = LVTS_MSR_FILTERED_MODE,
13841377
},
13851378
{
@@ -1392,7 +1385,6 @@ static const struct lvts_ctrl_data mt8192_lvts_mcu_data_ctrl[] = {
13921385
},
13931386
.num_lvts_sensor = 4,
13941387
.offset = 0x200,
1395-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8192,
13961388
.mode = LVTS_MSR_FILTERED_MODE,
13971389
}
13981390
};
@@ -1406,7 +1398,6 @@ static const struct lvts_ctrl_data mt8192_lvts_ap_data_ctrl[] = {
14061398
},
14071399
.num_lvts_sensor = 2,
14081400
.offset = 0x0,
1409-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8192,
14101401
},
14111402
{
14121403
.cal_offset = { 0x2c, 0x30 },
@@ -1416,7 +1407,6 @@ static const struct lvts_ctrl_data mt8192_lvts_ap_data_ctrl[] = {
14161407
},
14171408
.num_lvts_sensor = 2,
14181409
.offset = 0x100,
1419-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8192,
14201410
},
14211411
{
14221412
.cal_offset = { 0x34, 0x38 },
@@ -1426,7 +1416,6 @@ static const struct lvts_ctrl_data mt8192_lvts_ap_data_ctrl[] = {
14261416
},
14271417
.num_lvts_sensor = 2,
14281418
.offset = 0x200,
1429-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8192,
14301419
},
14311420
{
14321421
.cal_offset = { 0x3c, 0x40, 0x44 },
@@ -1437,7 +1426,6 @@ static const struct lvts_ctrl_data mt8192_lvts_ap_data_ctrl[] = {
14371426
},
14381427
.num_lvts_sensor = 3,
14391428
.offset = 0x300,
1440-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8192,
14411429
}
14421430
};
14431431

@@ -1450,7 +1438,6 @@ static const struct lvts_ctrl_data mt8195_lvts_mcu_data_ctrl[] = {
14501438
},
14511439
.num_lvts_sensor = 2,
14521440
.offset = 0x0,
1453-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8195,
14541441
},
14551442
{
14561443
.cal_offset = { 0x0d, 0x10 },
@@ -1460,7 +1447,6 @@ static const struct lvts_ctrl_data mt8195_lvts_mcu_data_ctrl[] = {
14601447
},
14611448
.num_lvts_sensor = 2,
14621449
.offset = 0x100,
1463-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8195,
14641450
},
14651451
{
14661452
.cal_offset = { 0x16, 0x19, 0x1c, 0x1f },
@@ -1472,7 +1458,6 @@ static const struct lvts_ctrl_data mt8195_lvts_mcu_data_ctrl[] = {
14721458
},
14731459
.num_lvts_sensor = 4,
14741460
.offset = 0x200,
1475-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8195,
14761461
}
14771462
};
14781463

@@ -1485,7 +1470,6 @@ static const struct lvts_ctrl_data mt8195_lvts_ap_data_ctrl[] = {
14851470
},
14861471
.num_lvts_sensor = 2,
14871472
.offset = 0x0,
1488-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8195,
14891473
},
14901474
{
14911475
.cal_offset = { 0x2e, 0x31 },
@@ -1495,7 +1479,6 @@ static const struct lvts_ctrl_data mt8195_lvts_ap_data_ctrl[] = {
14951479
},
14961480
.num_lvts_sensor = 2,
14971481
.offset = 0x100,
1498-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8195,
14991482
},
15001483
{
15011484
.cal_offset = { 0x37, 0x3a, 0x3d },
@@ -1506,7 +1489,6 @@ static const struct lvts_ctrl_data mt8195_lvts_ap_data_ctrl[] = {
15061489
},
15071490
.num_lvts_sensor = 3,
15081491
.offset = 0x200,
1509-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8195,
15101492
},
15111493
{
15121494
.cal_offset = { 0x43, 0x46 },
@@ -1516,7 +1498,6 @@ static const struct lvts_ctrl_data mt8195_lvts_ap_data_ctrl[] = {
15161498
},
15171499
.num_lvts_sensor = 2,
15181500
.offset = 0x300,
1519-
.hw_tshut_temp = LVTS_HW_SHUTDOWN_MT8195,
15201501
}
15211502
};
15221503

0 commit comments

Comments
 (0)