Commit d284d6cd authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

Merge tag 'thermal-v6.10-rc4' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux

Merge thermal driver fixes for 6.10-rc5 from Daniel Lezcano:

"- Remove the filtered mode for mt8188 as it is not supported on this
   platform (Julien Panis)

 - Fail in case the golden temperature is zero as that means the efuse
   data is not correctly set (Julien Panis)"

* tag 'thermal-v6.10-rc4' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal/drivers/mediatek/lvts_thermal: Return error in case of invalid efuse data
  thermal/drivers/mediatek/lvts_thermal: Remove filtered mode for mt8188
parents 494c7d05 72cacd06
...@@ -769,7 +769,11 @@ static int lvts_golden_temp_init(struct device *dev, u8 *calib, ...@@ -769,7 +769,11 @@ static int lvts_golden_temp_init(struct device *dev, u8 *calib,
*/ */
gt = (((u32 *)calib)[0] >> lvts_data->gt_calib_bit_offset) & 0xff; gt = (((u32 *)calib)[0] >> lvts_data->gt_calib_bit_offset) & 0xff;
if (gt && gt < LVTS_GOLDEN_TEMP_MAX) /* A zero value for gt means that device has invalid efuse data */
if (!gt)
return -ENODATA;
if (gt < LVTS_GOLDEN_TEMP_MAX)
golden_temp = gt; golden_temp = gt;
golden_temp_offset = golden_temp * 500 + lvts_data->temp_offset; golden_temp_offset = golden_temp * 500 + lvts_data->temp_offset;
...@@ -1458,7 +1462,6 @@ static const struct lvts_ctrl_data mt8188_lvts_mcu_data_ctrl[] = { ...@@ -1458,7 +1462,6 @@ static const struct lvts_ctrl_data mt8188_lvts_mcu_data_ctrl[] = {
}, },
VALID_SENSOR_MAP(1, 1, 1, 1), VALID_SENSOR_MAP(1, 1, 1, 1),
.offset = 0x0, .offset = 0x0,
.mode = LVTS_MSR_FILTERED_MODE,
}, },
{ {
.lvts_sensor = { .lvts_sensor = {
...@@ -1469,7 +1472,6 @@ static const struct lvts_ctrl_data mt8188_lvts_mcu_data_ctrl[] = { ...@@ -1469,7 +1472,6 @@ static const struct lvts_ctrl_data mt8188_lvts_mcu_data_ctrl[] = {
}, },
VALID_SENSOR_MAP(1, 1, 0, 0), VALID_SENSOR_MAP(1, 1, 0, 0),
.offset = 0x100, .offset = 0x100,
.mode = LVTS_MSR_FILTERED_MODE,
} }
}; };
...@@ -1483,7 +1485,6 @@ static const struct lvts_ctrl_data mt8188_lvts_ap_data_ctrl[] = { ...@@ -1483,7 +1485,6 @@ static const struct lvts_ctrl_data mt8188_lvts_ap_data_ctrl[] = {
}, },
VALID_SENSOR_MAP(0, 1, 0, 0), VALID_SENSOR_MAP(0, 1, 0, 0),
.offset = 0x0, .offset = 0x0,
.mode = LVTS_MSR_FILTERED_MODE,
}, },
{ {
.lvts_sensor = { .lvts_sensor = {
...@@ -1496,7 +1497,6 @@ static const struct lvts_ctrl_data mt8188_lvts_ap_data_ctrl[] = { ...@@ -1496,7 +1497,6 @@ static const struct lvts_ctrl_data mt8188_lvts_ap_data_ctrl[] = {
}, },
VALID_SENSOR_MAP(1, 1, 1, 0), VALID_SENSOR_MAP(1, 1, 1, 0),
.offset = 0x100, .offset = 0x100,
.mode = LVTS_MSR_FILTERED_MODE,
}, },
{ {
.lvts_sensor = { .lvts_sensor = {
...@@ -1507,7 +1507,6 @@ static const struct lvts_ctrl_data mt8188_lvts_ap_data_ctrl[] = { ...@@ -1507,7 +1507,6 @@ static const struct lvts_ctrl_data mt8188_lvts_ap_data_ctrl[] = {
}, },
VALID_SENSOR_MAP(1, 1, 0, 0), VALID_SENSOR_MAP(1, 1, 0, 0),
.offset = 0x200, .offset = 0x200,
.mode = LVTS_MSR_FILTERED_MODE,
}, },
{ {
.lvts_sensor = { .lvts_sensor = {
...@@ -1518,7 +1517,6 @@ static const struct lvts_ctrl_data mt8188_lvts_ap_data_ctrl[] = { ...@@ -1518,7 +1517,6 @@ static const struct lvts_ctrl_data mt8188_lvts_ap_data_ctrl[] = {
}, },
VALID_SENSOR_MAP(1, 1, 0, 0), VALID_SENSOR_MAP(1, 1, 0, 0),
.offset = 0x300, .offset = 0x300,
.mode = LVTS_MSR_FILTERED_MODE,
} }
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment