From patchwork Fri Aug 18 08:43:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Botka X-Patchwork-Id: 13357473 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0B6F8C678DC for ; Fri, 18 Aug 2023 08:44:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YdmnfIAkaO7wsBQHvLlRr1XdtUjHeNoG3hUPkRnxqAI=; b=UK0Y0hVoquCtrJ fyIpw5Mt9P9h8Na6rI1jbUKa7OSrmlBiCV9r6jqF8hefEv6EYjT6dJaUnVyu5TPzJk2VpIHdFnCBu kqiMtN8Ap9Q8L4bnmsLsRv4PbOJ037OxPfRceziLP0sOTzsZ41ggHvQY7SW0fWp575mPTWmRT0m0e LQ4DcZKkiugwZC7Ri7W7XiTNLDwY5fTntBh2/Zv26dfJKFNQQrhijkonbTqCxZar+ahdVBpduAZpp 7i0fH0FCPrMd2yaW651yaPHSdXQkj/bx9hkF96oZZ8XYXXa5m6VUgTbDigvExob1v3aBNFB6kIIkB u2fJVkIp+m7DkojzahQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qWv5n-00815g-2h; Fri, 18 Aug 2023 08:44:27 +0000 Received: from relay07.th.seeweb.it ([2001:4b7a:2000:18::168]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qWv54-0080oW-06 for linux-arm-kernel@lists.infradead.org; Fri, 18 Aug 2023 08:43:45 +0000 Received: from v0.lan (bband-dyn221.178-41-211.t-com.sk [178.41.211.221]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r2.th.seeweb.it (Postfix) with ESMTPSA id 340B23F494; Fri, 18 Aug 2023 10:43:32 +0200 (CEST) From: Martin Botka Date: Fri, 18 Aug 2023 10:43:17 +0200 Subject: [PATCH 2/3] thermal: sun8i: Add support for H616 THS controller MIME-Version: 1.0 Message-Id: <20230818-ths-h616-v1-2-0e1e058b9c7a@somainline.org> References: <20230818-ths-h616-v1-0-0e1e058b9c7a@somainline.org> In-Reply-To: <20230818-ths-h616-v1-0-0e1e058b9c7a@somainline.org> To: Vasily Khoruzhick , Yangtao Li , "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland Cc: 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 , Martin Botka X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1692348210; l=5190; i=martin.botka@somainline.org; s=20230811; h=from:subject:message-id; bh=xQ5NpF2sBXs+JiiHHr8efzGqOVQPt1m6OVF7QQ+h+ZY=; b=jz3bWRjz0N7UxXX20arD4hdWbltMc/jqEKdg26ZAlCzmKrsT0IgWWskI2SR1Vlx4VC9OsjD0L vPB2EWaupPrDFCq/yzbNPx/NKJ6FgDS6yNyZrnHjvqS1NMU2P6Yl6gL X-Developer-Key: i=martin.botka@somainline.org; a=ed25519; pk=aTCd3jmwU8GrJidWg3DSKLpdVMcpFzXzCSLXLR6NtWU= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230818_014342_443673_2345DFC5 X-CRM114-Status: GOOD ( 18.50 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 | 115 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c index 195f3c5d0b38..9d73e4313ad8 100644 --- a/drivers/thermal/sun8i_thermal.c +++ b/drivers/thermal/sun8i_thermal.c @@ -108,6 +108,12 @@ static int sun50i_h5_calc_temp(struct ths_device *tmdev, return -1590 * reg / 10 + 276000; } +static int sun50i_h616_calc_temp(struct ths_device *tmdev, + int id, int reg) +{ + return (reg + tmdev->chip->offset) * tmdev->chip->scale; +} + static int sun8i_ths_get_temp(struct thermal_zone_device *tz, int *temp) { struct tsensor *s = thermal_zone_device_priv(tz); @@ -278,6 +284,64 @@ 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 degreee celusis. + */ + 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; + + delta = (ft_temp * 100 - tmdev->chip->calc_temp(tmdev, i, reg)) + / 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), + 0xfff << offset, + cdata << offset); + } + + return 0; +} + static int sun8i_ths_calibrate(struct ths_device *tmdev) { struct nvmem_cell *calcell; @@ -453,6 +517,43 @@ static int sun50i_h6_thermal_init(struct ths_device *tmdev) return 0; } +static int sun50i_h616_thermal_init(struct ths_device *tmdev) +{ + int val; + + /* + * T_acq = 20us + * clkin = 24MHz + * + * x = T_acq * clkin - 1 + * = 479 + */ + regmap_write(tmdev->regmap, SUN50I_THS_CTRL0, + SUN8I_THS_CTRL0_T_ACQ0(47) | SUN8I_THS_CTRL2_T_ACQ1(479)); + /* average over 4 samples */ + regmap_write(tmdev->regmap, SUN50I_H6_THS_MFC, + SUN50I_THS_FILTER_EN | + SUN50I_THS_FILTER_TYPE(1)); + /* + * clkin = 24MHz + * filter_samples = 4 + * period = 0.25s + * + * x = period * clkin / 4096 / filter_samples - 1 + * = 365 + */ + regmap_write(tmdev->regmap, SUN50I_H6_THS_PC, + SUN50I_H6_THS_PC_TEMP_PERIOD(365)); + /* enable sensor */ + val = GENMASK(tmdev->chip->sensor_num - 1, 0); + regmap_write(tmdev->regmap, SUN50I_H6_THS_ENABLE, val); + /* thermal data interrupt enable */ + val = GENMASK(tmdev->chip->sensor_num - 1, 0); + regmap_write(tmdev->regmap, SUN50I_H6_THS_DIC, val); + + return 0; +} + static int sun8i_ths_register(struct ths_device *tmdev) { int i; @@ -608,6 +709,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 = -3255, + .scale = -81, + .temp_data_base = SUN50I_H6_THS_TEMP_DATA, + .calibrate = sun50i_h616_ths_calibrate, + .init = sun50i_h616_thermal_init, + .irq_ack = sun50i_h6_irq_ack, + .calc_temp = sun50i_h616_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 +730,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);