Commit a4c40559 authored by Laura Nao's avatar Laura Nao Committed by Daniel Lezcano
Browse files

thermal/drivers/mediatek/lvts: Add platform ops to support alternative conversion logic 



Introduce lvts_platform_ops struct to support SoC-specific versions of
lvts_raw_to_temp() and lvts_temp_to_raw() conversion functions.

This is in preparation for supporting SoCs like MT8196/MT6991, which
require a different lvts_temp_to_raw() implementation.

Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: default avatarLaura Nao <laura.nao@collabora.com>
Link: https://patch.msgid.link/20251125-mt8196-lvts-v4-v5-3-6db7eb903fb7@collabora.com


Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 6931d597

drivers/thermal/mediatek/lvts_thermal.c

+34 −5
Original line number Diff line number Diff line
@@ -126,8 +126,14 @@ struct lvts_ctrl_data { 
			continue; \

		else



struct lvts_platform_ops {

	int (*lvts_raw_to_temp)(u32 raw_temp, int temp_factor);

	u32 (*lvts_temp_to_raw)(int temperature, int temp_factor);

};



struct lvts_data {

	const struct lvts_ctrl_data *lvts_ctrl;

	const struct lvts_platform_ops *ops;

	const u32 *conn_cmd;

	const u32 *init_cmd;

	int num_cal_offsets;
@@ -273,7 +279,17 @@ static inline int lvts_debugfs_init(struct device *dev, 


#endif



static int lvts_raw_to_temp(u32 raw_temp, int temp_factor)

static int lvts_raw_to_temp(u32 raw_temp, const struct lvts_data *lvts_data)

{

	return lvts_data->ops->lvts_raw_to_temp(raw_temp & 0xFFFF, lvts_data->temp_factor);

}



static u32 lvts_temp_to_raw(int temperature, const struct lvts_data *lvts_data)

{

	return lvts_data->ops->lvts_temp_to_raw(temperature, lvts_data->temp_factor);

}



static int lvts_raw_to_temp_mt7988(u32 raw_temp, int temp_factor)

{

	int temperature;
@@ -283,7 +299,7 @@ static int lvts_raw_to_temp(u32 raw_temp, int temp_factor) 
	return temperature;

}



static u32 lvts_temp_to_raw(int temperature, int temp_factor)

static u32 lvts_temp_to_raw_mt7988(int temperature, int temp_factor)

{

	u32 raw_temp = ((s64)(golden_temp_offset - temperature)) << 14;
@@ -330,7 +346,7 @@ static int lvts_get_temp(struct thermal_zone_device *tz, int *temp) 
	if (rc)

		return -EAGAIN;



	*temp = lvts_raw_to_temp(value & 0xFFFF, lvts_data->temp_factor);

	*temp = lvts_raw_to_temp(value, lvts_data);



	return 0;

}
@@ -400,8 +416,8 @@ static int lvts_set_trips(struct thermal_zone_device *tz, int low, int high) 
	const struct lvts_data *lvts_data = lvts_ctrl->lvts_data;

	void __iomem *base = lvts_sensor->base;

	u32 raw_low = lvts_temp_to_raw(low != -INT_MAX ? low : LVTS_MINIMUM_THRESHOLD,

				       lvts_data->temp_factor);

	u32 raw_high = lvts_temp_to_raw(high, lvts_data->temp_factor);

				       lvts_data);

	u32 raw_high = lvts_temp_to_raw(high, lvts_data);

	bool should_update_thresh;



	lvts_sensor->low_thresh = low;
@@ -1778,6 +1794,11 @@ static const struct lvts_ctrl_data mt8195_lvts_ap_data_ctrl[] = { 
	}

};



static const struct lvts_platform_ops lvts_platform_ops_mt7988 = {

	.lvts_raw_to_temp = lvts_raw_to_temp_mt7988,

	.lvts_temp_to_raw = lvts_temp_to_raw_mt7988,

};



static const struct lvts_data mt7988_lvts_ap_data = {

	.lvts_ctrl	= mt7988_lvts_ap_data_ctrl,

	.conn_cmd	= mt7988_conn_cmds,
@@ -1789,6 +1810,7 @@ static const struct lvts_data mt7988_lvts_ap_data = { 
	.temp_offset	= LVTS_COEFF_B_MT7988,

	.gt_calib_bit_offset = 24,

	.num_cal_offsets = LVTS_NUM_CAL_OFFSETS_MT7988,

	.ops = &lvts_platform_ops_mt7988,

};



static const struct lvts_data mt8186_lvts_data = {
@@ -1803,6 +1825,7 @@ static const struct lvts_data mt8186_lvts_data = { 
	.gt_calib_bit_offset = 24,

	.def_calibration = 19000,

	.num_cal_offsets = LVTS_NUM_CAL_OFFSETS_MT7988,

	.ops = &lvts_platform_ops_mt7988,

};



static const struct lvts_data mt8188_lvts_mcu_data = {
@@ -1817,6 +1840,7 @@ static const struct lvts_data mt8188_lvts_mcu_data = { 
	.gt_calib_bit_offset = 20,

	.def_calibration = 35000,

	.num_cal_offsets = LVTS_NUM_CAL_OFFSETS_MT7988,

	.ops = &lvts_platform_ops_mt7988,

};



static const struct lvts_data mt8188_lvts_ap_data = {
@@ -1831,6 +1855,7 @@ static const struct lvts_data mt8188_lvts_ap_data = { 
	.gt_calib_bit_offset = 20,

	.def_calibration = 35000,

	.num_cal_offsets = LVTS_NUM_CAL_OFFSETS_MT7988,

	.ops = &lvts_platform_ops_mt7988,

};



static const struct lvts_data mt8192_lvts_mcu_data = {
@@ -1845,6 +1870,7 @@ static const struct lvts_data mt8192_lvts_mcu_data = { 
	.gt_calib_bit_offset = 24,

	.def_calibration = 35000,

	.num_cal_offsets = LVTS_NUM_CAL_OFFSETS_MT7988,

	.ops = &lvts_platform_ops_mt7988,

};



static const struct lvts_data mt8192_lvts_ap_data = {
@@ -1859,6 +1885,7 @@ static const struct lvts_data mt8192_lvts_ap_data = { 
	.gt_calib_bit_offset = 24,

	.def_calibration = 35000,

	.num_cal_offsets = LVTS_NUM_CAL_OFFSETS_MT7988,

	.ops = &lvts_platform_ops_mt7988,

};



static const struct lvts_data mt8195_lvts_mcu_data = {
@@ -1873,6 +1900,7 @@ static const struct lvts_data mt8195_lvts_mcu_data = { 
	.gt_calib_bit_offset = 24,

	.def_calibration = 35000,

	.num_cal_offsets = LVTS_NUM_CAL_OFFSETS_MT7988,

	.ops = &lvts_platform_ops_mt7988,

};



static const struct lvts_data mt8195_lvts_ap_data = {
@@ -1887,6 +1915,7 @@ static const struct lvts_data mt8195_lvts_ap_data = { 
	.gt_calib_bit_offset = 24,

	.def_calibration = 35000,

	.num_cal_offsets = LVTS_NUM_CAL_OFFSETS_MT7988,

	.ops = &lvts_platform_ops_mt7988,

};



static const struct of_device_id lvts_of_match[] = {