From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B61D0C71145 for ; Wed, 23 Aug 2023 19:44:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238366AbjHWTo0 convert rfc822-to-8bit (ORCPT ); Wed, 23 Aug 2023 15:44:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233413AbjHWTnx (ORCPT ); Wed, 23 Aug 2023 15:43:53 -0400 Received: from relay02.th.seeweb.it (relay02.th.seeweb.it [5.144.164.163]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7121610CB for ; Wed, 23 Aug 2023 12:43:51 -0700 (PDT) Received: from [192.168.2.144] (bband-dyn125.178-40-246.t-com.sk [178.40.246.125]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r1.th.seeweb.it (Postfix) with ESMTPSA id 48BE1203FB; Wed, 23 Aug 2023 21:43:46 +0200 (CEST) Date: Wed, 23 Aug 2023 21:43:40 +0200 From: Martin Botka Subject: Re: [PATCH v2 2/3] thermal: sun8i: Add support for H616 THS controller To: Jernej =?iso-8859-2?q?=A9krabec?= Cc: Vasily Khoruzhick , Yangtao Li , "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Samuel Holland , linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Andre Przywara , Alan Ma , Luke Harrison , Marijn Suijten , AngeloGioacchino Del Regno , Konrad Dybcio , Martin Botka Message-Id: In-Reply-To: <21986607.EfDdHjke4D@jernej-laptop> References: <20230821-ths-h616-v2-0-cda60d556798@somainline.org> <20230821-ths-h616-v2-2-cda60d556798@somainline.org> <21986607.EfDdHjke4D@jernej-laptop> X-Mailer: geary/43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-2; format=flowed Content-Transfer-Encoding: 8BIT Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Aug 23 2023 at 09:38:30 PM +02:00:00, Jernej Škrabec wrote: > Dne ponedeljek, 21. avgust 2023 ob 16:03:47 CEST je Martin Botka > napisal(a): >> Add support for the thermal sensor found in H616 SoC >> which slightly resembles the H6 thermal sensor >> controller with few changes like 4 sensors. >> >> Signed-off-by: Martin Botka >> --- >> drivers/thermal/sun8i_thermal.c | 74 >> +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 >> insertions(+) >> >> diff --git a/drivers/thermal/sun8i_thermal.c >> b/drivers/thermal/sun8i_thermal.c index 195f3c5d0b38..cf96ab6a445b >> 100644 >> --- a/drivers/thermal/sun8i_thermal.c >> +++ b/drivers/thermal/sun8i_thermal.c >> @@ -278,6 +278,66 @@ static int sun50i_h6_ths_calibrate(struct >> ths_device >> *tmdev, return 0; >> } >> >> +static int sun50i_h616_ths_calibrate(struct ths_device *tmdev, >> + u16 *caldata, int callen) >> +{ >> + struct device *dev = tmdev->dev; >> + int i, ft_temp; >> + >> + if (!caldata[0]) >> + return -EINVAL; >> + >> + /* >> + * h616 efuse THS calibration data layout: >> + * >> + * 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 H616 is the ambient temperature and >> + * sensor values that are filled during the factory test stage. >> + * >> + * The unit of stored FT temperature is 0.1 degree celsius. >> + */ >> + ft_temp = caldata[0] & FT_TEMP_MASK; >> + >> + for (i = 0; i < tmdev->chip->sensor_num; i++) { >> + int delta, cdata, offset, reg; >> + >> + if (i == 3) >> + reg = (caldata[1] >> 12) >> + | ((caldata[2] >> 12) << 4) >> + | ((caldata[3] >> 12) << 8); >> + else >> + reg = (int)caldata[i + 1] & TEMP_CALIB_MASK; >> + >> + int sensor_temp = tmdev->chip->calc_temp(tmdev, i, reg); > > Variable declaration should be done at the beginning of code block. Hello Jernej, Indeed. Will fix in next revision :) Cheers, Martin > > Best regards, > Jernej > >> + >> + delta = (sensor_temp - ft_temp * 100) * 10; >> + delta /= tmdev->chip->scale; >> + cdata = CALIBRATE_DEFAULT - delta; >> + if (cdata & ~TEMP_CALIB_MASK) { >> + dev_warn(dev, "sensor%d is not calibrated. > \n", i); >> + >> + continue; >> + } >> + >> + offset = (i % 2) * 16; >> + regmap_update_bits(tmdev->regmap, >> + SUN50I_H6_THS_TEMP_CALIB + (i / > 2 * 4), >> + TEMP_CALIB_MASK << offset, >> + cdata << offset); >> + } >> + >> + return 0; >> +} >> + >> static int sun8i_ths_calibrate(struct ths_device *tmdev) >> { >> struct nvmem_cell *calcell; >> @@ -608,6 +668,19 @@ static const struct ths_thermal_chip >> sun50i_h6_ths = { >> .calc_temp = sun8i_ths_calc_temp, >> }; >> >> +static const struct ths_thermal_chip sun50i_h616_ths = { >> + .sensor_num = 4, >> + .has_bus_clk_reset = true, >> + .ft_deviation = 8000, >> + .offset = 263655, >> + .scale = 810, >> + .temp_data_base = SUN50I_H6_THS_TEMP_DATA, >> + .calibrate = sun50i_h616_ths_calibrate, >> + .init = sun50i_h6_thermal_init, >> + .irq_ack = sun50i_h6_irq_ack, >> + .calc_temp = sun8i_ths_calc_temp, >> +}; >> + >> static const struct of_device_id of_ths_match[] = { >> { .compatible = "allwinner,sun8i-a83t-ths", .data = > &sun8i_a83t_ths }, >> { .compatible = "allwinner,sun8i-h3-ths", .data = &sun8i_h3_ths }, >> @@ -616,6 +689,7 @@ static const struct of_device_id of_ths_match[] >> = { >> { .compatible = "allwinner,sun50i-a100-ths", .data = > &sun50i_a100_ths }, >> { .compatible = "allwinner,sun50i-h5-ths", .data = &sun50i_h5_ths > }, >> { .compatible = "allwinner,sun50i-h6-ths", .data = &sun50i_h6_ths > }, >> + { .compatible = "allwinner,sun50i-h616-ths", .data = > &sun50i_h616_ths }, >> { /* sentinel */ }, >> }; >> MODULE_DEVICE_TABLE(of, of_ths_match); > > > >