Hi,
On Sat, Aug 10, 2019 at 05:28:26AM +0000, Yangtao Li wrote:
> From: Icenowy Zheng <icenowy@xxxxxxx>
>
> The H5 temperature calculation function is strange. Firstly, it's
> segmented. Secondly, the formula of two sensors are different in the
> second segment.
>
> Allow to use a custom temperature calculation function, in case of
> the function is complex.
>
> Signed-off-by: Icenowy Zheng <icenowy@xxxxxxx>
When you send a patch on someone else's behalf, you need to put your
Signed-off-by as well.
> ---
> drivers/thermal/sun8i_thermal.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
> index 3259081da841..a761e2afda08 100644
> --- a/drivers/thermal/sun8i_thermal.c
> +++ b/drivers/thermal/sun8i_thermal.c
> @@ -76,6 +76,7 @@ struct ths_thermal_chip {
> u16 *caldata, int callen);
> int (*init)(struct ths_device *tmdev);
> int (*irq_ack)(struct ths_device *tmdev);
> + int (*calc_temp)(int id, int reg);
> };
>
> struct ths_device {
> @@ -90,9 +91,12 @@ struct ths_device {
>
> /* Temp Unit: millidegree Celsius */
> static int sun8i_ths_reg2temp(struct ths_device *tmdev,
> - int reg)
> + int id, int reg)
> {
> - return (reg + tmdev->chip->offset) * tmdev->chip->scale;
> + if (tmdev->chip->calc_temp)
> + return tmdev->chip->calc_temp(id, reg);
> + else
> + return (reg + tmdev->chip->offset) * tmdev->chip->scale;
You're not consistent here compared to the other callbacks you have
introduced: calibrate, init and irq_ack all need to be set and will
fail (hard) if you don't set them, yet this one will have a different
behaviour (that behaviour being to use the H6 formula, which is the
latest SoC, which is a bit odd in itself).
I guess we should either make it mandatory as the rest of the
callbacks, or document which callbacks are mandatory and which are
optional (and the behaviour when it's optional).
Maxime
--
Maxime Ripard, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Attachment:
signature.asc
Description: PGP signature
