| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374 |
- From 6c04a419a4c5fb18edefc44dd676fb95c7f6c55d Mon Sep 17 00:00:00 2001
- From: Maksim Kiselev <[email protected]>
- Date: Mon, 19 Feb 2024 15:36:36 +0000
- Subject: [PATCH] thermal/drivers/sun8i: Extend H6 calibration to support 4
- sensors
- The H616 SoC resembles the H6 thermal sensor controller, with a few
- changes like four sensors.
- Extend sun50i_h6_ths_calibrate() function to support calibration of
- these sensors.
- Co-developed-by: Martin Botka <[email protected]>
- Signed-off-by: Martin Botka <[email protected]>
- Signed-off-by: Maksim Kiselev <[email protected]>
- Reviewed-by: Andre Przywara <[email protected]>
- Signed-off-by: Andre Przywara <[email protected]>
- Reviewed-by: Jernej Skrabec <[email protected]>
- Acked-by: Vasily Khoruzhick <[email protected]>
- Signed-off-by: Daniel Lezcano <[email protected]>
- Link: https://lore.kernel.org/r/[email protected]
- ---
- drivers/thermal/sun8i_thermal.c | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
- --- a/drivers/thermal/sun8i_thermal.c
- +++ b/drivers/thermal/sun8i_thermal.c
- @@ -224,16 +224,21 @@ static int sun50i_h6_ths_calibrate(struc
- struct device *dev = tmdev->dev;
- int i, ft_temp;
-
- - if (!caldata[0] || callen < 2 + 2 * tmdev->chip->sensor_num)
- + if (!caldata[0])
- return -EINVAL;
-
- /*
- * efuse layout:
- *
- - * 0 11 16 32
- - * +-------+-------+-------+
- - * |temp| |sensor0|sensor1|
- - * +-------+-------+-------+
- + * 0 11 16 27 32 43 48 57
- + * +----------+-----------+-----------+-----------+
- + * | temp | |sensor0| |sensor1| |sensor2| |
- + * +----------+-----------+-----------+-----------+
- + * ^ ^ ^
- + * | | |
- + * | | sensor3[11:8]
- + * | sensor3[7:4]
- + * sensor3[3:0]
- *
- * The calibration data on the H6 is the ambient temperature and
- * sensor values that are filled during the factory test stage.
- @@ -246,9 +251,16 @@ static int sun50i_h6_ths_calibrate(struc
- ft_temp = (caldata[0] & FT_TEMP_MASK) * 100;
-
- for (i = 0; i < tmdev->chip->sensor_num; i++) {
- - int sensor_reg = caldata[i + 1] & TEMP_CALIB_MASK;
- - int cdata, offset;
- - int sensor_temp = tmdev->chip->calc_temp(tmdev, i, sensor_reg);
- + int sensor_reg, sensor_temp, cdata, offset;
- +
- + if (i == 3)
- + sensor_reg = (caldata[1] >> 12)
- + | ((caldata[2] >> 12) << 4)
- + | ((caldata[3] >> 12) << 8);
- + else
- + sensor_reg = caldata[i + 1] & TEMP_CALIB_MASK;
- +
- + sensor_temp = tmdev->chip->calc_temp(tmdev, i, sensor_reg);
-
- /*
- * Calibration data is CALIBRATE_DEFAULT - (calculated
|
