From nobody Mon Sep 28 07:22:50 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC62B3C3C0E; Tue, 25 Aug 2026 06:28:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787639314; cv=none; b=X1L1Rm//E+/Ht0yBJAQEf2whwI0guHGHGtwd3ZNhk/tEyCj6d0r/Fv1Eatx7rx1yfwh+Hn4FHD8+xDjazw7+2HfwW+FJzNMYb9eIg0Fyo7Yg6kHHdsrhu9/i2lDRi8p8TymK2FZ7TJvYzKhSLNzss+fesmQl1OuV4S3FJNL42yU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787639314; c=relaxed/simple; bh=2TU5UtSqlTK5Fx9D95GxY0TfdDPbOgZck8finK/MKtM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=CiaSKtFJ54kOweX3fKtUdxebt5VRFe+TMtgfJKKGX9qCdmONQ5hke8mn2USyVmaMMayL28YescTxbo4CfXxxwoyFhhZelbMDsgi5UVK/R3ZJEH5VF8O4S6e/IeJ5XQ7VpmthxiI8cXe3uOfzmgBIc9QqTUHsCbgKWYtCZ3GqAGo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HwqEGci2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HwqEGci2" Received: by smtp.kernel.org (Postfix) with ESMTPS id 4D6C6C2BCF6; Tue, 25 Aug 2026 06:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1787639314; bh=2TU5UtSqlTK5Fx9D95GxY0TfdDPbOgZck8finK/MKtM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=HwqEGci2IieJ0DgW5CB/7HVRGN7RykD4quUqNH+gTq38Aj9yu0a2NzhqbNoaLbRAK gIOBOWtTa27Pxs6foXlollH1F5vAGG4m6w31deG5rX42kbtJmPMvTVWiGlqOQ1pN7d ME/JDTNHs5PZEjjP+AksDVH7gXQzgwdbty9Z6bc7KKu26cnihkQb8GqLtnrUoPqngN YoQgfyBWiYE2PB+2HdkkS4x6vs0C3l6W59fRFT24/NejugJMLXz670VUVEQU458rC/ d+ZmlpqBQTxUz4L3g0KRjF0xAY3Q0eBDs62rENV6tBkBhCkpwzFYOtyfoYGbH2UTEe DTB/s6Piu5kJg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2ECD5C61CE3; Tue, 25 Aug 2026 06:28:34 +0000 (UTC) From: Xianwei Zhao via B4 Relay Date: Tue, 25 Aug 2026 06:28:29 +0000 Subject: [PATCH v4 1/2] dt-bindings: thermal: amlogic: Add A9 thermal bindings Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260825-a9-thermal-v4-1-d8fc9859cf22@amlogic.com> References: <20260825-a9-thermal-v4-0-d8fc9859cf22@amlogic.com> In-Reply-To: <20260825-a9-thermal-v4-0-d8fc9859cf22@amlogic.com> To: Guillaume La Roque , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-pm@vger.kernel.org, linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Xianwei Zhao , Conor Dooley X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787639310; l=1701; i=xianwei.zhao@amlogic.com; s=20251216; h=from:subject:message-id; bh=z03XxmpaVvRhkUiS0uq3ppP3WR/hzF6qXYwRuBxcXJE=; b=4ecCzrDqMsskePU+vwx0rj+vxH6zsH2Qc+c3HyewSXxo2Jp51pPujjQvYl8vIzXaMPnmLPAbT OkCiwm9I48EAYVfH3irVJUWOpcsH0doxK78fJQiYVtZCdhSfESh84E/ X-Developer-Key: i=xianwei.zhao@amlogic.com; a=ed25519; pk=dWwxtWCxC6FHRurOmxEtr34SuBYU+WJowV/ZmRJ7H+k= X-Endpoint-Received: by B4 Relay for xianwei.zhao@amlogic.com/20251216 with auth_id=578 X-Original-From: Xianwei Zhao Reply-To: xianwei.zhao@amlogic.com From: Xianwei Zhao Document the thermal controller compatibles for the Amlogic A9 SoC. Describe the required "core" and "pclk" clocks, and update the schema constraints for A9-specific thermal controllers. Acked-by: Conor Dooley Signed-off-by: Xianwei Zhao --- .../bindings/thermal/amlogic,thermal.yaml | 27 ++++++++++++++++++= +++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml= b/Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml index 8cfa44dcda58..1b02404d67d5 100644 --- a/Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml +++ b/Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml @@ -23,6 +23,7 @@ properties: - const: amlogic,g12a-thermal - enum: - amlogic,a1-cpu-thermal + - amlogic,a9-thermal - amlogic,t7-thermal =20 reg: @@ -32,7 +33,13 @@ properties: maxItems: 1 =20 clocks: - maxItems: 1 + minItems: 1 + maxItems: 2 + + clock-names: + items: + - const: core + - const: pclk =20 power-domains: maxItems: 1 @@ -73,6 +80,24 @@ allOf: required: - amlogic,secure-monitor =20 + - if: + properties: + compatible: + contains: + enum: + - amlogic,a9-thermal + then: + properties: + clocks: + minItems: 2 + required: + - clock-names + else: + properties: + clocks: + maxItems: 1 + clock-names: false + unevaluatedProperties: false =20 examples: --=20 2.52.0 From nobody Mon Sep 28 07:22:50 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC7593C3F5D; Tue, 25 Aug 2026 06:28:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787639314; cv=none; b=NkBV6alGuXagXE6AzEqyMILepz4MLu65nJmgp3+DXt6Ka7Tb/HRHz0DkRCeiRCk5h35m2GGo4Vzn81d/LUd5RYabWUzYJ0W0s72nOEbK0MHvEwGiKikanQia2706l8cXqO57iTngv72j+L1kJiEnY/eDfsFJRNMZE21Z6bdnGKk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787639314; c=relaxed/simple; bh=PbSSfXiBLSxmPn8ILK//ibUmFFlEtAgjqIYv0MRe6ns=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aPcgr4zraNgKYGj5vzTML/dsXnrTx4BFSyOl0t8q3xxDrZnjUIEWmSQMm8vD0Im9FBvLfg7s3R8Ou8U7IzPMfpw9xVs/MCaNNTVJpf8apC9FUtGKWPm05If/l/m756zCxtbdv9jh6bttTJW4QYPmYFu34rieiGn3elETJTlZQ44= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fb7l7CZv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="fb7l7CZv" Received: by smtp.kernel.org (Postfix) with ESMTPS id 5F19AC2BCFB; Tue, 25 Aug 2026 06:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1787639314; bh=PbSSfXiBLSxmPn8ILK//ibUmFFlEtAgjqIYv0MRe6ns=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=fb7l7CZvk8z2Ghw+OYHsi5WK9oLWBbOJd6mXk3fgPzx3s7QUPPPXz/itrRw06g/MA euiBN4PKzXn+Btb8WxipvhBb9ruM7Sqzwzi8taYThu3btBmuaOML6LUbLOQ89Tfodx uQ+ZHZuVgXms7hM/I77CXWPo1D36A18GZCe/RMYm/VEy9o41pi8AlMQfLFd2khqMip luA0EWKF6onDdQqhy+aTSTSwBjq36K14QXusgSQYVsh0VIn9cxBncj/oWjGKOsw5RV bVbbX6+nyAm2yHhcHXcVrZ5U1qn2Fb9iUCebWaQL4AapGnyP4887b1yiQk48MyYEaG bQDTYiud8ys0g== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FB2DC5DF94; Tue, 25 Aug 2026 06:28:34 +0000 (UTC) From: Xianwei Zhao via B4 Relay Date: Tue, 25 Aug 2026 06:28:30 +0000 Subject: [PATCH v4 2/2] thermal: amlogic: Add support for A9 thermal controller Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260825-a9-thermal-v4-2-d8fc9859cf22@amlogic.com> References: <20260825-a9-thermal-v4-0-d8fc9859cf22@amlogic.com> In-Reply-To: <20260825-a9-thermal-v4-0-d8fc9859cf22@amlogic.com> To: Guillaume La Roque , "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-pm@vger.kernel.org, linux-amlogic@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Xianwei Zhao X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787639310; l=7652; i=xianwei.zhao@amlogic.com; s=20251216; h=from:subject:message-id; bh=3dfvHQnGdP9ve0NXcUneDp5jbhHO1z54DG2NM2Ag4AQ=; b=SkL8ubdKmv5W7u8iWU1QlQSuCEoG3tYwMh2uBXYzzskuf4Yj08BwNMY3YpYjjcHxvz20Lr3CO z5Xbjuly8w8B40OU7TXMfU+fNaghwGbEmFKqiiLKIKdzMl7tH2dllS5 X-Developer-Key: i=xianwei.zhao@amlogic.com; a=ed25519; pk=dWwxtWCxC6FHRurOmxEtr34SuBYU+WJowV/ZmRJ7H+k= X-Endpoint-Received: by B4 Relay for xianwei.zhao@amlogic.com/20251216 with auth_id=578 X-Original-From: Xianwei Zhao Reply-To: xianwei.zhao@amlogic.com From: Xianwei Zhao Add support for the Amlogic A9 thermal controller. The A9 thermal controller uses different calibration parameters, requires separate core and bus clocks, and supports a hardware over-temperature reset mechanism, and restore the hardware reset configuration after resume. Signed-off-by: Xianwei Zhao --- drivers/thermal/amlogic_thermal.c | 113 ++++++++++++++++++++++++++++++++++= +++- 1 file changed, 110 insertions(+), 3 deletions(-) diff --git a/drivers/thermal/amlogic_thermal.c b/drivers/thermal/amlogic_th= ermal.c index a0b530624b60..74f0bc49c737 100644 --- a/drivers/thermal/amlogic_thermal.c +++ b/drivers/thermal/amlogic_thermal.c @@ -45,6 +45,18 @@ TSENSOR_CFG_REG1_DEM_EN | \ TSENSOR_CFG_REG1_CH_SEL) =20 +#define TSENSOR_CFG_REG2 0x8 + #define TSENSOR_CFG_REG2_HITEMP_EN BIT(31) + #define TSENSOR_CFG_REG2_REBOOT_EN BIT(30) + #define TSENSOR_CFG_REG2_REBOOT_CODE GENMASK(15, 4) + #define TSENSOR_CFG_REG2_REBOOT_TIME GENMASK(23, 16) + #define TSENSOR_CFG_REG2_ENABLE \ + (TSENSOR_CFG_REG2_HITEMP_EN | \ + TSENSOR_CFG_REG2_REBOOT_EN | \ + TSENSOR_CFG_REG2_REBOOT_TIME) + +#define TSENSOR_TEMP_CAL 1 + #define TSENSOR_STAT0 0x40 =20 #define TSENSOR_STAT9 0x64 @@ -63,6 +75,7 @@ =20 #define TSENSOR_CALIB_OFFSET 1 #define TSENSOR_CALIB_SHIFT 4 +#define TSENSOR_HW_RESET_DEFAULT_TEMP 110000 =20 /** * struct amlogic_thermal_soc_calib_data @@ -85,14 +98,18 @@ struct amlogic_thermal_soc_calib_data { * @u_efuse_off: register offset to read fused calibration value * @calibration_parameters: calibration parameters structure pointer * @regmap_config: regmap config for the device + * @reset_temp: the hardware-controlled reset temperature value * @use_sm: read data from secure monitor instead of efuse + * @has_sysclk: sensor driver control sysclk * This structure is required for configuration of amlogic thermal driver. */ struct amlogic_thermal_data { int u_efuse_off; const struct amlogic_thermal_soc_calib_data *calibration_parameters; const struct regmap_config *regmap_config; + u32 reset_temp; bool use_sm; + bool has_sysclk; }; =20 struct amlogic_thermal { @@ -101,8 +118,10 @@ struct amlogic_thermal { struct regmap *regmap; struct regmap *sec_ao_map; struct clk *clk; + struct clk *sysclk; struct thermal_zone_device *tzd; u32 trim_info; + u32 temp_code; struct meson_sm_firmware *sm_fw; u32 tsensor_id; }; @@ -138,6 +157,49 @@ static int amlogic_thermal_code_to_millicelsius(struct= amlogic_thermal *pdata, return temp; } =20 +/* + * Calculate a temperature code from a temperature value . + * The unit of the temperature is degree milliCelsius. + */ +static u32 amlogic_thermal_millicelsius_to_code(struct amlogic_thermal *pd= ata, int millicelsius) +{ + const struct amlogic_thermal_soc_calib_data *param =3D + pdata->data->calibration_parameters; + s64 factor, uptat, uefuse; + u32 temp_code; + + uefuse =3D pdata->trim_info & TSENSOR_TRIM_SIGN_MASK ? + ~(pdata->trim_info & TSENSOR_TRIM_TEMP_MASK) + 1 : + (pdata->trim_info & TSENSOR_TRIM_TEMP_MASK); + + factor =3D param->B + div_s64(millicelsius, 100); + factor =3D BIT(16) * factor; + factor =3D div_s64(factor, param->A); + factor =3D factor - uefuse; + + uptat =3D param->n * factor; + uptat =3D div_s64(uptat, BIT(16)); + uptat =3D param->m - uptat; + + factor =3D factor * 100; + if (!uptat) + factor =3D (TSENSOR_TEMP_MASK - TSENSOR_TEMP_CAL) << 0x4; + else + factor =3D div_s64(factor, uptat); + + temp_code =3D ((factor >> 0x4) & TSENSOR_TEMP_MASK) + TSENSOR_TEMP_CAL; + + return temp_code; +} + +static void amlogic_tsensor_setup_hw_reset(struct amlogic_thermal *data) +{ + regmap_update_bits(data->regmap, TSENSOR_CFG_REG2, TSENSOR_CFG_REG2_REBOO= T_CODE, + data->temp_code << 0x4); + regmap_update_bits(data->regmap, TSENSOR_CFG_REG2, + TSENSOR_CFG_REG2_ENABLE, TSENSOR_CFG_REG2_ENABLE); +} + static int amlogic_thermal_enable(struct amlogic_thermal *data) { int ret; @@ -254,6 +316,13 @@ static const struct amlogic_thermal_soc_calib_data aml= ogic_thermal_g12a =3D { .n =3D 324, }; =20 +static const struct amlogic_thermal_soc_calib_data amlogic_thermal_a9 =3D { + .A =3D 9164, + .B =3D 2747, + .m =3D 370, + .n =3D 270, +}; + static const struct amlogic_thermal_data amlogic_thermal_g12a_cpu_param = =3D { .u_efuse_off =3D 0x128, .calibration_parameters =3D &amlogic_thermal_g12a, @@ -272,6 +341,14 @@ static const struct amlogic_thermal_data amlogic_therm= al_a1_cpu_param =3D { .regmap_config =3D &amlogic_thermal_regmap_config_g12a, }; =20 +static const struct amlogic_thermal_data amlogic_thermal_a9_param =3D { + .use_sm =3D true, + .has_sysclk =3D true, + .calibration_parameters =3D &amlogic_thermal_a9, + .regmap_config =3D &amlogic_thermal_regmap_config_g12a, + .reset_temp =3D 110000, +}; + static const struct amlogic_thermal_data amlogic_thermal_t7_param =3D { .use_sm =3D true, .calibration_parameters =3D &amlogic_thermal_g12a, @@ -291,6 +368,10 @@ static const struct of_device_id of_amlogic_thermal_ma= tch[] =3D { .compatible =3D "amlogic,a1-cpu-thermal", .data =3D &amlogic_thermal_a1_cpu_param, }, + { + .compatible =3D "amlogic,a9-thermal", + .data =3D &amlogic_thermal_a9_param, + }, { .compatible =3D "amlogic,t7-thermal", .data =3D &amlogic_thermal_t7_param, @@ -305,6 +386,7 @@ static int amlogic_thermal_probe(struct platform_device= *pdev) struct device *dev =3D &pdev->dev; void __iomem *base; int ret; + u32 reset_temp; =20 pdata =3D devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) @@ -323,9 +405,18 @@ static int amlogic_thermal_probe(struct platform_devic= e *pdev) if (IS_ERR(pdata->regmap)) return PTR_ERR(pdata->regmap); =20 - pdata->clk =3D devm_clk_get(dev, NULL); - if (IS_ERR(pdata->clk)) - return dev_err_probe(dev, PTR_ERR(pdata->clk), "failed to get clock\n"); + if (pdata->data->has_sysclk) { + pdata->clk =3D devm_clk_get(dev, "core"); + if (IS_ERR(pdata->clk)) + return dev_err_probe(dev, PTR_ERR(pdata->clk), "failed to get core clk\= n"); + pdata->sysclk =3D devm_clk_get_enabled(dev, "pclk"); + if (IS_ERR(pdata->sysclk)) + return dev_err_probe(dev, PTR_ERR(pdata->sysclk), "failed to get pclk\n= "); + } else { + pdata->clk =3D devm_clk_get(dev, NULL); + if (IS_ERR(pdata->clk)) + return dev_err_probe(dev, PTR_ERR(pdata->clk), "failed to get clock\n"); + } =20 if (pdata->data->use_sm) ret =3D amlogic_thermal_probe_sm(pdev, pdata); @@ -346,6 +437,17 @@ static int amlogic_thermal_probe(struct platform_devic= e *pdev) =20 devm_thermal_add_hwmon_sysfs(&pdev->dev, pdata->tzd); =20 + if (pdata->data->reset_temp) { + reset_temp =3D pdata->data->reset_temp; + } else { + dev_dbg(dev, "using default hardware reset temperature\n"); + reset_temp =3D TSENSOR_HW_RESET_DEFAULT_TEMP; + } + + pdata->temp_code =3D amlogic_thermal_millicelsius_to_code(pdata, reset_te= mp); + + amlogic_tsensor_setup_hw_reset(pdata); + ret =3D amlogic_thermal_enable(pdata); =20 return ret; @@ -363,6 +465,8 @@ static int amlogic_thermal_suspend(struct device *dev) struct amlogic_thermal *data =3D dev_get_drvdata(dev); =20 amlogic_thermal_disable(data); + if (data->data->has_sysclk) + clk_disable_unprepare(data->sysclk); =20 return 0; } @@ -371,6 +475,9 @@ static int amlogic_thermal_resume(struct device *dev) { struct amlogic_thermal *data =3D dev_get_drvdata(dev); =20 + if (data->data->has_sysclk) + clk_prepare_enable(data->sysclk); + amlogic_tsensor_setup_hw_reset(data); return amlogic_thermal_enable(data); } =20 --=20 2.52.0