From: Andre Przywara <andre.przywara@arm.com> To: Vasily Khoruzhick <anarsoul@gmail.com>, Yangtao Li <tiny.windzz@gmail.com>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org> Cc: "Rafael J . Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Zhang Rui <rui.zhang@intel.com>, Lukasz Luba <lukasz.luba@arm.com>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Martin Botka <martin.botka@somainline.org>, Bob McChesney <bob@electricworry.net>, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v3 5/6] thermal: sun8i: add support for H616 THS controller Date: Tue, 28 Nov 2023 00:58:48 +0000 [thread overview] Message-ID: <20231128005849.19044-6-andre.przywara@arm.com> (raw) In-Reply-To: <20231128005849.19044-1-andre.przywara@arm.com> From: Martin Botka <martin.botka@somainline.org> Add support for the thermal sensor found in H616 SoCs, which slightly resembles the H6 thermal sensor controller, with a few changes like four sensors. Also the registers readings are wrong, unless a bit in the first SYS_CFG register cleared, so set needs_syscon to trigger that code Signed-off-by: Martin Botka <martin.botka@somainline.org> Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/thermal/sun8i_thermal.c | 73 +++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c index 920e419ce7343..9a404fa9d76a9 100644 --- a/drivers/thermal/sun8i_thermal.c +++ b/drivers/thermal/sun8i_thermal.c @@ -280,6 +280,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 degree celsius. + */ + ft_temp = caldata[0] & FT_TEMP_MASK; + + for (i = 0; i < tmdev->chip->sensor_num; i++) { + int delta, cdata, offset, reg, temp; + + if (i == 3) + reg = (caldata[1] >> 12) + | ((caldata[2] >> 12) << 4) + | ((caldata[3] >> 12) << 8); + else + reg = (int)caldata[i + 1] & TEMP_CALIB_MASK; + + temp = tmdev->chip->calc_temp(tmdev, i, reg); + delta = ((temp - ft_temp * 100) * 10) / 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; @@ -659,6 +717,20 @@ 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, + .needs_syscon = 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 }, @@ -667,6 +739,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); -- 2.35.8
WARNING: multiple messages have this Message-ID (diff)
From: Andre Przywara <andre.przywara@arm.com> To: Vasily Khoruzhick <anarsoul@gmail.com>, Yangtao Li <tiny.windzz@gmail.com>, Chen-Yu Tsai <wens@csie.org>, Jernej Skrabec <jernej.skrabec@gmail.com>, Samuel Holland <samuel@sholland.org> Cc: "Rafael J . Wysocki" <rafael@kernel.org>, Daniel Lezcano <daniel.lezcano@linaro.org>, Zhang Rui <rui.zhang@intel.com>, Lukasz Luba <lukasz.luba@arm.com>, Rob Herring <robh+dt@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>, Conor Dooley <conor+dt@kernel.org>, Martin Botka <martin.botka@somainline.org>, Bob McChesney <bob@electricworry.net>, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev Subject: [PATCH v3 5/6] thermal: sun8i: add support for H616 THS controller Date: Tue, 28 Nov 2023 00:58:48 +0000 [thread overview] Message-ID: <20231128005849.19044-6-andre.przywara@arm.com> (raw) In-Reply-To: <20231128005849.19044-1-andre.przywara@arm.com> From: Martin Botka <martin.botka@somainline.org> Add support for the thermal sensor found in H616 SoCs, which slightly resembles the H6 thermal sensor controller, with a few changes like four sensors. Also the registers readings are wrong, unless a bit in the first SYS_CFG register cleared, so set needs_syscon to trigger that code Signed-off-by: Martin Botka <martin.botka@somainline.org> Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- drivers/thermal/sun8i_thermal.c | 73 +++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c index 920e419ce7343..9a404fa9d76a9 100644 --- a/drivers/thermal/sun8i_thermal.c +++ b/drivers/thermal/sun8i_thermal.c @@ -280,6 +280,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 degree celsius. + */ + ft_temp = caldata[0] & FT_TEMP_MASK; + + for (i = 0; i < tmdev->chip->sensor_num; i++) { + int delta, cdata, offset, reg, temp; + + if (i == 3) + reg = (caldata[1] >> 12) + | ((caldata[2] >> 12) << 4) + | ((caldata[3] >> 12) << 8); + else + reg = (int)caldata[i + 1] & TEMP_CALIB_MASK; + + temp = tmdev->chip->calc_temp(tmdev, i, reg); + delta = ((temp - ft_temp * 100) * 10) / 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; @@ -659,6 +717,20 @@ 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, + .needs_syscon = 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 }, @@ -667,6 +739,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); -- 2.35.8 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-11-28 1:00 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-11-28 0:58 [PATCH v3 0/6] Add support for H616 Thermal system Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-11-28 0:58 ` [PATCH v3 1/6] soc: sunxi: sram: export register 0 for THS on H616 Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-11-28 0:58 ` [PATCH v3 2/6] dt-bindings: thermal: sun8i: Add H616 THS controller Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-11-28 7:41 ` Krzysztof Kozlowski 2023-11-28 7:41 ` Krzysztof Kozlowski 2023-11-28 0:58 ` [PATCH v3 3/6] thermal: sun8i: explain unknown H6 register value Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-11-28 0:58 ` [PATCH v3 4/6] thermal: sun8i: add syscon register access code Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-11-28 7:43 ` Krzysztof Kozlowski 2023-11-28 7:43 ` Krzysztof Kozlowski 2023-11-28 7:50 ` Chen-Yu Tsai 2023-11-28 7:50 ` Chen-Yu Tsai 2023-11-28 8:29 ` Krzysztof Kozlowski 2023-11-28 8:29 ` Krzysztof Kozlowski 2023-11-28 8:59 ` Chen-Yu Tsai 2023-11-28 8:59 ` Chen-Yu Tsai 2023-11-28 9:02 ` Chen-Yu Tsai 2023-11-28 9:02 ` Chen-Yu Tsai 2023-11-28 9:09 ` Chen-Yu Tsai 2023-11-28 9:09 ` Chen-Yu Tsai 2023-11-28 9:13 ` Krzysztof Kozlowski 2023-11-28 9:13 ` Krzysztof Kozlowski 2023-11-28 14:11 ` Krzysztof Kozlowski 2023-11-28 14:11 ` Krzysztof Kozlowski 2023-11-28 14:33 ` Andre Przywara 2023-11-28 14:33 ` Andre Przywara 2023-11-28 14:48 ` Krzysztof Kozlowski 2023-11-28 14:48 ` Krzysztof Kozlowski 2023-11-28 16:10 ` Andre Przywara 2023-11-28 16:10 ` Andre Przywara 2023-11-28 16:39 ` Chen-Yu Tsai 2023-11-28 16:39 ` Chen-Yu Tsai 2023-11-28 16:50 ` Rob Herring 2023-11-28 16:50 ` Rob Herring 2023-11-29 17:03 ` Andre Przywara 2023-11-29 17:03 ` Andre Przywara 2023-11-29 17:09 ` Chen-Yu Tsai 2023-11-29 17:09 ` Chen-Yu Tsai 2023-11-28 0:58 ` Andre Przywara [this message] 2023-11-28 0:58 ` [PATCH v3 5/6] thermal: sun8i: add support for H616 THS controller Andre Przywara 2023-12-09 10:44 ` Maksim Kiselev 2023-12-09 10:44 ` Maksim Kiselev 2023-12-11 0:05 ` Andre Przywara 2023-12-11 0:05 ` Andre Przywara 2023-12-12 18:09 ` Maxim Kiselev 2023-12-12 18:09 ` Maxim Kiselev 2023-12-14 9:59 ` Andre Przywara 2023-12-14 9:59 ` Andre Przywara 2023-12-17 14:16 ` Maxim Kiselev 2023-12-17 14:16 ` Maxim Kiselev 2023-11-28 0:58 ` [PATCH v3 6/6] arm64: dts: allwinner: h616: Add thermal sensor and zones Andre Przywara 2023-11-28 0:58 ` Andre Przywara 2023-12-13 9:41 [PATCH v3 5/6] thermal: sun8i: add support for H616 THS controller Maxim Kiselev 2023-12-14 9:59 ` Andre Przywara 2023-12-14 9:59 ` Andre Przywara
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20231128005849.19044-6-andre.przywara@arm.com \ --to=andre.przywara@arm.com \ --cc=anarsoul@gmail.com \ --cc=bob@electricworry.net \ --cc=conor+dt@kernel.org \ --cc=daniel.lezcano@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=jernej.skrabec@gmail.com \ --cc=krzysztof.kozlowski+dt@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-sunxi@lists.linux.dev \ --cc=lukasz.luba@arm.com \ --cc=martin.botka@somainline.org \ --cc=rafael@kernel.org \ --cc=robh+dt@kernel.org \ --cc=rui.zhang@intel.com \ --cc=samuel@sholland.org \ --cc=tiny.windzz@gmail.com \ --cc=wens@csie.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.