| Message ID | 20231217133637.54773-1-bigunclemax@gmail.com |
|---|---|
| State | Accepted |
| Commit | 63e39fcaa6db821b05103b55483a44d0c5b43abb |
| Headers | show |
| Series | [v1] thermal: sun8i: extend H6 calibration function to support 4 sensors | expand |
On Sun, 17 Dec 2023 16:36:36 +0300 Maksim Kiselev <bigunclemax@gmail.com> wrote: Hi Maksim, many thanks for sending this! > 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. Oh wow, I didn't expect that, but it's indeed that simple: we just need to cater for the 4th sensor's data to be cramped into the other bits, the rest is exactly the same! Well spotted! > Signed-off-by: Martin Botka <martin.botka@somainline.org> > Signed-off-by: Andre Przywara <andre.przywara@arm.com> I don't think the Signed-off-by:s are accurate here. Please replace those two with just: Co-developed-by: Martin Botka <martin.botka@somainline.org> (I didn't really do anything in those parts) > Signed-off-by: Maksim Kiselev <bigunclemax@gmail.com> I compared the two routines and came to the same solution as you, so: Reviewed-by: Andre Przywara <andre.przywara@arm.com> I will incorporate this patch into the next submission of the H616 THS series, so there is no need to merge this patch as is. Cheers, Andre > --- > drivers/thermal/sun8i_thermal.c | 28 ++++++++++++++++++++-------- > 1 file changed, 20 insertions(+), 8 deletions(-) > > diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c > index f989b55a8aa8..9af95b4785be 100644 > --- a/drivers/thermal/sun8i_thermal.c > +++ b/drivers/thermal/sun8i_thermal.c > @@ -221,16 +221,21 @@ static int sun50i_h6_ths_calibrate(struct ths_device *tmdev, > 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. > @@ -243,9 +248,16 @@ static int sun50i_h6_ths_calibrate(struct ths_device *tmdev, > 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
diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c index f989b55a8aa8..9af95b4785be 100644 --- a/drivers/thermal/sun8i_thermal.c +++ b/drivers/thermal/sun8i_thermal.c @@ -221,16 +221,21 @@ static int sun50i_h6_ths_calibrate(struct ths_device *tmdev, 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. @@ -243,9 +248,16 @@ static int sun50i_h6_ths_calibrate(struct ths_device *tmdev, 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