Add support of New Amlogic temperature sensor for G12 SoCs
Subsystems (4)
Guillaume La Roque
maintainerv4 cover Add support of New Amlogic temperature sensor for G12 SoCs
This patchs series add support of New Amlogic temperature sensor and minimal thermal zone for SEI510 and ODROID-N2 boards.
First implementation was doing on IIO[1] but after comments i move on thermal framework. Formulas and calibration values come from amlogic.
Changes since v3:
- Add cooling map and trip point for hot type
- move compatible on g12a instead of g12 to be aligned with others
- add all reviewer, sorry for this mistake
Changes since v2:
- fix yaml documention
- remove unneeded status variable for temperature-sensor node
- rework driver after Martin review
- add some information in commit message
Changes since v1:
- fix enum vs const in documentation
- fix error with thermal-sensor-cells value set to 1 instead of 0
- add some dependencies needed to add cooling-maps
Dependencies :
- patch 3,4 & 5: depends on Neil's patch and series :
- missing dwc2 phy-names[2]
- patchsets to add DVFS on G12a[3] which have deps on [4] and [5]
[1] https://lore.kernel.org/linux-amlogic/[email protected]/
[2] https://lore.kernel.org/linux-amlogic/[email protected]/
[3] https://lore.kernel.org/linux-amlogic/[email protected]/
[4] https://lore.kernel.org/linux-amlogic/[email protected]/
[5] https://lore.kernel.org/linux-amlogic/[email protected]/
Guillaume La Roque (6):
dt-bindings: thermal: Add DT bindings documentation for Amlogic
Thermal
thermal: amlogic: Add thermal driver to support G12 SoCs
arm64: dts: amlogic: g12: add temperature sensor
arm64: dts: meson: sei510: Add minimal thermal zone
arm64: dts: amlogic: odroid-n2: add minimal thermal zone
MAINTAINERS: add entry for Amlogic Thermal driver
.../bindings/thermal/amlogic,thermal.yaml | 54 +++ MAINTAINERS | 9 + .../boot/dts/amlogic/meson-g12-common.dtsi | 20 ++ .../boot/dts/amlogic/meson-g12a-sei510.dts | 70 ++++ .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 76 ++++ drivers/thermal/Kconfig | 11 + drivers/thermal/Makefile | 1 + drivers/thermal/amlogic_thermal.c | 335 ++++++++++++++++++ 8 files changed, 576 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml create mode 100644 drivers/thermal/amlogic_thermal.c
Signature · 1 line
2.17.1
Guillaume La Roque
maintainerPATCH v4 1/6 dt-bindings: thermal: Add DT bindings documentation for Amlogic Thermal
Adding the devicetree binding documentation for the Amlogic temperature sensor found in the Amlogic Meson G12 SoCs.
the G12A and G12B SoCs are supported.
--- .../bindings/thermal/amlogic,thermal.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml
Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml new file +54 -0
@@ -0,0 +1,54 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/thermal/amlogic,thermal.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Thermal + +maintainers: + - Guillaume La Roque <[email protected]> + +description: Binding for Amlogic Thermal + +properties: + compatible: + items: + - enum: + - amlogic,g12a-cpu-thermal + - amlogic,g12a-ddr-thermal + - const: amlogic,g12a-thermal + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + + amlogic,ao-secure: + description: phandle to the ao-secure syscon + $ref: '/schemas/types.yaml#/definitions/phandle' + + +required: + - compatible + - reg + - interrupts + - clocks + - amlogic,ao-secure + +examples: + - | + cpu_temp: temperature-sensor@ff634800 { + compatible = "amlogic,g12a-cpu-thermal", + "amlogic,g12a-thermal"; + reg = <0xff634800 0x50>; + interrupts = <0x0 0x24 0x0>; + clocks = <&clk 164>; + #thermal-sensor-cells = <0>; + amlogic,ao-secure = <&sec_AO>; + }; +...
Signature · 1 line
2.17.1
Kevin Hilman
maintainerRe: [PATCH v4 1/6] dt-bindings: thermal: Add DT bindings documentation for Amlogic Thermal
Quoted 6 lines · Guillaume La Roque
Adding the devicetree binding documentation for the Amlogic temperature sensor found in the Amlogic Meson G12 SoCs.
the G12A and G12B SoCs are supported.Signed-off-by Guillaume La Roque <[email protected]>Reviewed-by Rob Herring <[email protected]>
nit: put your sign-off at the end. The tags you collect from reviewers/testers should go first.
Kevin
Re: [PATCH v4 1/6] dt-bindings: thermal: Add DT bindings documentation for Amlogic Thermal
In reply to Guillaume La RoqueQuoted 4 lines · Guillaume La Roque
Adding the devicetree binding documentation for the Amlogic temperature sensor found in the Amlogic Meson G12 SoCs.
the G12A and G12B SoCs are supported.
Merge the two sentences into a single one?
Quoted 70 lines
Signed-off-by Guillaume La Roque <[email protected]>Reviewed-by Rob Herring <[email protected]>--- .../bindings/thermal/amlogic,thermal.yaml | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/amlogic,thermal.yamlDocumentation/devicetree/bindings/thermal/amlogic,thermal.yaml new file +54
-1@@ -0,0 +1,54 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/thermal/amlogic,thermal.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Amlogic Thermal + +maintainers: + - Guillaume La Roque <[email protected]> + +description: Binding for Amlogic Thermal + +properties: + compatible: + items: + - enum: + - amlogic,g12a-cpu-thermal + - amlogic,g12a-ddr-thermal + - const: amlogic,g12a-thermal + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + maxItems: 1 + + amlogic,ao-secure: + description: phandle to the ao-secure syscon + $ref: '/schemas/types.yaml#/definitions/phandle' + + +required: + - compatible + - reg + - interrupts + - clocks + - amlogic,ao-secure + +examples: + - | + cpu_temp: temperature-sensor@ff634800 { + compatible = "amlogic,g12a-cpu-thermal", + "amlogic,g12a-thermal"; + reg = <0xff634800 0x50>; + interrupts = <0x0 0x24 0x0>; + clocks = <&clk 164>; + #thermal-sensor-cells = <0>; + amlogic,ao-secure = <&sec_AO>; + }; +... --2.17.1
Guillaume La Roque
maintainerPATCH v4 2/6 thermal: amlogic: Add thermal driver to support G12 SoCs
In reply to Guillaume La RoqueAmlogic G12A and G12B SoCs integrate two thermal sensors with the same design.
One is located close to the DDR controller and the other one is located close to the PLLs (between the CPU and GPU).
The calibration data for each of the thermal sensors instance is stored in a different location within the AO region.
Implement reading the temperature from each thermal sensor.
The IP block has more functionality, which may be added to this driver in the future:
- chip reset when the temperature exceeds a configurable threshold
- up to four interrupts when the temperature has risen above a configurable threshold
- up to four interrupts when the temperature has fallen below a configurable threshold
--- drivers/thermal/Kconfig | 11 + drivers/thermal/Makefile | 1 + drivers/thermal/amlogic_thermal.c | 335 ++++++++++++++++++++++++++++++ 3 files changed, 347 insertions(+) create mode 100644 drivers/thermal/amlogic_thermal.c
drivers/thermal/Kconfig +11 -0
@@ -348,6 +348,17 @@ config MTK_THERMAL Enable this option if you want to have support for thermal management controller present in Mediatek SoCs +config AMLOGIC_THERMAL + tristate "Amlogic Thermal Support" + default ARCH_MESON + depends on OF && ARCH_MESON + help + If you say yes here you get support for Amlogic Thermal + for G12 SoC Family. + + This driver can also be built as a module. If so, the module will + be called amlogic_thermal. + menu "Intel thermal drivers" depends on X86 || X86_INTEL_QUARK || COMPILE_TEST source "drivers/thermal/intel/Kconfig"
drivers/thermal/Makefile +1 -0
@@ -54,3 +54,4 @@ obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o obj-$(CONFIG_ZX2967_THERMAL) += zx2967_thermal.o obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o +obj-$(CONFIG_AMLOGIC_THERMAL) += amlogic_thermal.o
drivers/thermal/amlogic_thermal.c new file +335 -0
335 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [PATCH v4 2/6] thermal: amlogic: Add thermal driver to support G12 SoCs
Hello thermal maintainers,
Quoted 18 lines · Guillaume La Roque
Amlogic G12A and G12B SoCs integrate two thermal sensors with the same design.
One is located close to the DDR controller and the other one is located close to the PLLs (between the CPU and GPU).The calibration data for each of the thermal sensors instance is stored in a different location within the AO region.
Implement reading the temperature from each thermal sensor.
The IP block has more functionality, which may be added to this driver in the future:
- chip reset when the temperature exceeds a configurable threshold
- up to four interrupts when the temperature has risen above a configurable threshold
- up to four interrupts when the temperature has fallen below a configurable threshold
Quoted 1 line
Signed-off-by Guillaume La Roque <[email protected]>
Could we get a review/merge of this driver ( and hopefully queued up for v5.4 ?)
This has been reviewed and tested by users on this platform and it's working well.
Thanks,
Kevin
Re: [PATCH v4 2/6] thermal: amlogic: Add thermal driver to support G12 SoCs
In reply to Guillaume La RoqueQuoted 5 lines · Guillaume La Roque
Amlogic G12A and G12B SoCs integrate two thermal sensors with the same design.
One is located close to the DDR controller and the other one is located close to the PLLs (between the CPU and GPU).
Merge into one paragraph?
Quoted 131 lines
The calibration data for each of the thermal sensors instance is stored in a different location within the AO region.
Implement reading the temperature from each thermal sensor.
The IP block has more functionality, which may be added to this driver in the future:
- chip reset when the temperature exceeds a configurable threshold
- up to four interrupts when the temperature has risen above a configurable threshold
- up to four interrupts when the temperature has fallen below a configurable thresholdSigned-off-by Guillaume La Roque <[email protected]>--- drivers/thermal/Kconfig | 11 + drivers/thermal/Makefile | 1 + drivers/thermal/amlogic_thermal.c | 335 ++++++++++++++++++++++++++++++ 3 files changed, 347 insertions(+) create mode 100644 drivers/thermal/amlogic_thermal.cdrivers/thermal/Kconfig +11
-0@@ -348,6 +348,17 @@ config MTK_THERMAL Enable this option if you want to have support for thermal management controller present in Mediatek SoCs +config AMLOGIC_THERMAL + tristate "Amlogic Thermal Support" + default ARCH_MESON + depends on OF && ARCH_MESON + help + If you say yes here you get support for Amlogic Thermal + for G12 SoC Family. + + This driver can also be built as a module. If so, the module will + be called amlogic_thermal. + menu "Intel thermal drivers" depends on X86 || X86_INTEL_QUARK || COMPILE_TEST source "drivers/thermal/intel/Kconfig"drivers/thermal/Makefile +1
-0@@ -54,3 +54,4 @@ obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o obj-$(CONFIG_ZX2967_THERMAL) += zx2967_thermal.o obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o +obj-$(CONFIG_AMLOGIC_THERMAL) += amlogic_thermal.odrivers/thermal/amlogic_thermal.c new file +73
-0@@ -0,0 +1,335 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Amlogic Thermal Sensor Driver +* +* Copyright (C) 2017 Huan Biao <[email protected]> +* Copyright (C) 2019 Guillaume La Roque <[email protected]> +* +* Register value to celsius temperature formulas: +* Read_Val m * U +* U = ---------, Uptat = --------- +* 2^16 1 + n * U +* +* Temperature = A * ( Uptat + u_efuse / 2^16 )- B +* +* A B m n : calibration parameters +* u_efuse : fused calibration value, it's a signed 16 bits value +*/ + +#include <linux/bitfield.h> +#include <linux/clk.h> +#include <linux/io.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> +#include <linux/thermal.h> + +#include "thermal_core.h" + +#define TSENSOR_CFG_REG1 0x4 +#define TSENSOR_CFG_REG1_RSET_VBG BIT(12) +#define TSENSOR_CFG_REG1_RSET_ADC BIT(11) +#define TSENSOR_CFG_REG1_VCM_EN BIT(10) +#define TSENSOR_CFG_REG1_VBG_EN BIT(9) +#define TSENSOR_CFG_REG1_OUT_CTL BIT(6) +#define TSENSOR_CFG_REG1_FILTER_EN BIT(5) +#define TSENSOR_CFG_REG1_DEM_EN BIT(3) +#define TSENSOR_CFG_REG1_CH_SEL GENMASK(1, 0) +#define TSENSOR_CFG_REG1_ENABLE \ + (TSENSOR_CFG_REG1_FILTER_EN | \ + TSENSOR_CFG_REG1_VCM_EN | \ + TSENSOR_CFG_REG1_VBG_EN | \ + TSENSOR_CFG_REG1_DEM_EN | \ + TSENSOR_CFG_REG1_CH_SEL) + +#define TSENSOR_STAT0 0x40 + +#define TSENSOR_STAT9 0x64 + +#define TSENSOR_READ_TEMP_MASK GENMASK(15, 0) +#define TSENSOR_TEMP_MASK GENMASK(11, 0) + +#define TSENSOR_TRIM_SIGN_MASK BIT(15) +#define TSENSOR_TRIM_TEMP_MASK GENMASK(14, 0) +#define TSENSOR_TRIM_VERSION_MASK GENMASK(31, 24) + +#define TSENSOR_TRIM_VERSION (_version) \ + FIELD_GET(TSENSOR_TRIM_VERSION_MASK, _version) + +#define TSENSOR_TRIM_CALIB_VALID_MASK (GENMASK(3, 2) | BIT(7)) + +#define TSENSOR_CALIB_OFFSET 1 +#define TSENSOR_CALIB_SHIFT 4 + +/** +* struct amlogic_thermal_soc_calib_data +* @A, B, m, n: calibration parameters +* This structure is required for configuration of amlogic thermal driver. +*/ +struct amlogic_thermal_soc_calib_data {
drivers/thermal/amlogic_thermal.c line 83
Quoted 10 lines
drivers/thermal/amlogic_thermal.c new file +10
-0+int A ; +int B ; +int m; +int n; +}; + +/** +* struct amlogic_thermal_data +* @u_efuse_off: register offset to read fused calibration value +* @soc: calibration parameters structure pointer
This doesn't match the member below.
Quoted 159 lines
drivers/thermal/amlogic_thermal.c new file +159
-0+* @regmap_config: regmap config for the device +* 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; +}; + +struct amlogic_thermal { +struct platform_device *pdev; +const struct amlogic_thermal_data *data; +struct regmap *regmap; +struct regmap *sec_ao_map; +struct clk *clk; +struct thermal_zone_device *tzd; +u32 trim_info; +}; + +/* +* Calculate a temperature value from a temperature code. +* The unit of the temperature is degree milliCelsius. +*/ +static int amlogic_thermal_code_to_millicelsius (struct amlogic_thermal *pdata, +int temp_code) +{ +const struct amlogic_thermal_soc_calib_data *param = + pdata->data->calibration_parameters; +int temp; +s64 factor, Uptat, uefuse; + + uefuse = pdata->trim_info &TSENSOR_TRIM_SIGN_MASK ? + ~(pdata->trim_info &TSENSOR_TRIM_TEMP_MASK ) +1 : + (pdata->trim_info &TSENSOR_TRIM_TEMP_MASK ); + + factor = param->n * temp_code; + factor =div_s64 (factor,100 ); + + Uptat = temp_code * param->m; + Uptat =div_s64 (Uptat,100 ); + Uptat = Uptat *BIT (16 ); + Uptat =div_s64 (Uptat,BIT (16 ) + factor); + + temp = (Uptat + uefuse) * param->A; + temp =div_s64 (temp,BIT (16 )); + temp = (temp - param->B) *100 ; + +return temp; +} + +static int amlogic_thermal_initialize (struct amlogic_thermal *pdata) +{ +int ret =0 ; +int ver; + +regmap_read (pdata->sec_ao_map, pdata->data->u_efuse_off, + &pdata->trim_info); + + ver =TSENSOR_TRIM_VERSION (pdata->trim_info); + +if ((ver &TSENSOR_TRIM_CALIB_VALID_MASK ) ==0 ) { + ret = -EINVAL ; +dev_err (&pdata->pdev->dev, +"tsensor thermal calibration not supported: 0x%x!\n" , + ver); + } + +return ret; +} + +static int amlogic_thermal_enable (struct amlogic_thermal *data) +{ +int ret; + + ret =clk_prepare_enable (data->clk); +if (ret) +return ret; + +regmap_update_bits (data->regmap,TSENSOR_CFG_REG1 , +TSENSOR_CFG_REG1_ENABLE ,TSENSOR_CFG_REG1_ENABLE ); + +return 0 ; +} + +static int amlogic_thermal_disable (struct amlogic_thermal *data) +{ +regmap_update_bits (data->regmap,TSENSOR_CFG_REG1 , +TSENSOR_CFG_REG1_ENABLE ,0 ); +clk_disable_unprepare (data->clk); + +return 0 ; +} + +static int amlogic_thermal_get_temp (void *data,int *temp) +{ +unsigned int tval; +struct amlogic_thermal *pdata = data; + +if (!data) +return -EINVAL ; + +regmap_read (pdata->regmap,TSENSOR_STAT0 , &tval); + *temp = +amlogic_thermal_code_to_millicelsius (pdata, + tval &TSENSOR_READ_TEMP_MASK ); + +return 0 ; +} + +static const struct thermal_zone_of_device_ops amlogic_thermal_ops = { + .get_temp = amlogic_thermal_get_temp, +}; + +static const struct regmap_config amlogic_thermal_regmap_config_g12a = { + .reg_bits =8 , + .val_bits =32 , + .reg_stride =4 , + .max_register =TSENSOR_STAT9 , +}; + +static const struct amlogic_thermal_soc_calib_data amlogic_thermal_g12a = { + .A =9411 , + .B =3159 , + .m =424 , + .n =324 , +}; + +static const struct amlogic_thermal_data amlogic_thermal_g12a_cpu_param = { + .u_efuse_off =0x128 , + .calibration_parameters = &amlogic_thermal_g12a, + .regmap_config = &amlogic_thermal_regmap_config_g12a, +}; + +static const struct amlogic_thermal_data amlogic_thermal_g12a_ddr_param = { + .u_efuse_off =0xf0 , + .calibration_parameters = &amlogic_thermal_g12a, + .regmap_config = &amlogic_thermal_regmap_config_g12a, +}; + +static const struct of_device_id of_amlogic_thermal_match[] = { + { + .compatible ="amlogic,g12a-ddr-thermal" , + .data = &amlogic_thermal_g12a_ddr_param, + }, + { + .compatible ="amlogic,g12a-cpu-thermal" , + .data = &amlogic_thermal_g12a_cpu_param, + }, + {/* sentinel */ } +}; +MODULE_DEVICE_TABLE (of, of_amlogic_thermal_match); + +static int amlogic_thermal_probe (struct platform_device *pdev) +{ +struct amlogic_thermal *pdata; +struct device *dev = &pdev->dev; +struct resource *res; +void __iomem *base; +int ret;
drivers/thermal/amlogic_thermal.c line 252
Quoted 10 lines
drivers/thermal/amlogic_thermal.c new file +10
-0+ + pdata =devm_kzalloc (dev,sizeof (*pdata),GFP_KERNEL ); +if (!pdata) +return -ENOMEM ; + + pdata->data =of_device_get_match_data (dev); + pdata->pdev = pdev; +platform_set_drvdata (pdev, pdata); + + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
Use devm_platform_ioremap_resource instead.
Quoted 23 lines
drivers/thermal/amlogic_thermal.c new file +23
-0+ base =devm_ioremap_resource (dev, res); +if (IS_ERR (base)) { +dev_err (dev,"failed to get io address\n" ); +return PTR_ERR (base); + } + + pdata->regmap =devm_regmap_init_mmio (dev, base, + pdata->data->regmap_config); +if (IS_ERR (pdata->regmap)) +return PTR_ERR (pdata->regmap); + + pdata->clk =devm_clk_get (dev,NULL ); +if (IS_ERR (pdata->clk)) { +if (PTR_ERR (pdata->clk) != -EPROBE_DEFER ) +dev_err (dev,"failed to get clock\n" ); +return PTR_ERR (pdata->clk); + } + + pdata->sec_ao_map =syscon_regmap_lookup_by_phandle + (pdev->dev.of_node,"amlogic,ao-secure" ); +if (IS_ERR (pdata->sec_ao_map)) { +dev_err (dev,"syscon regmap lookup failed.\n" ); +return PTR_ERR (pdata->sec_ao_map);
drivers/thermal/amlogic_thermal.c line 285
Quoted 10 lines
drivers/thermal/amlogic_thermal.c new file +10
-0+ } + + pdata->tzd =devm_thermal_zone_of_sensor_register (&pdev->dev, +0 , + pdata, + &amlogic_thermal_ops); +if (IS_ERR (pdata->tzd)) { + ret =PTR_ERR (pdata->tzd); +dev_err (dev,"Failed to register tsensor: %d\n" , ret); +return PTR_ERR (pdata->tzd);
return ret;
Quoted 53 lines
drivers/thermal/amlogic_thermal.c new file +50
-1+ } + + ret =amlogic_thermal_initialize (pdata); +if (ret) +return ret; + + ret =amlogic_thermal_enable (pdata); + +return ret; +} + +static int amlogic_thermal_remove (struct platform_device *pdev) +{ +struct amlogic_thermal *data =platform_get_drvdata (pdev); + +return amlogic_thermal_disable (data); +} + +static int __maybe_unused amlogic_thermal_suspend (struct device *dev) +{ +struct amlogic_thermal *data =dev_get_drvdata (dev); + +return amlogic_thermal_disable (data); +} + +static int __maybe_unused amlogic_thermal_resume (struct device *dev) +{ +struct amlogic_thermal *data =dev_get_drvdata (dev); + +return amlogic_thermal_enable (data); +} + +static SIMPLE_DEV_PM_OPS(amlogic_thermal_pm_ops, + amlogic_thermal_suspend, amlogic_thermal_resume); + +static struct platform_driver amlogic_thermal_driver = { + .driver = { + .name ="amlogic_thermal" , + .pm = &amlogic_thermal_pm_ops, + .of_match_table = of_amlogic_thermal_match, + }, + .probe = amlogic_thermal_probe, + .remove = amlogic_thermal_remove, +}; + +module_platform_driver (amlogic_thermal_driver); + +MODULE_AUTHOR ("Guillaume La Roque <[email protected]>" ); +MODULE_DESCRIPTION ("Amlogic thermal driver" ); +MODULE_LICENSE ("GPL v2" ); --2.17.1
Guillaume La Roque
maintainerPATCH v4 3/6 arm64: dts: amlogic: g12: add temperature sensor
In reply to Guillaume La RoqueAdd cpu and ddr temperature sensors for G12 Socs
--- .../boot/dts/amlogic/meson-g12-common.dtsi | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +20 -0
@@ -1353,6 +1353,26 @@ }; }; + cpu_temp: temperature-sensor@34800 { + compatible = "amlogic,g12a-cpu-thermal", + "amlogic,g12a-thermal"; + reg = <0x0 0x34800 0x0 0x50>; + interrupts = <GIC_SPI 35 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_TS>; + #thermal-sensor-cells = <0>; + amlogic,ao-secure = <&sec_AO>; + }; + + ddr_temp: temperature-sensor@34c00 { + compatible = "amlogic,g12a-ddr-thermal", + "amlogic,g12a-thermal"; + reg = <0x0 0x34c00 0x0 0x50>; + interrupts = <GIC_SPI 36 IRQ_TYPE_EDGE_RISING>; + clocks = <&clkc CLKID_TS>; + #thermal-sensor-cells = <0>; + amlogic,ao-secure = <&sec_AO>; + }; + usb2_phy0: phy@36000 { compatible = "amlogic,g12a-usb2-phy"; reg = <0x0 0x36000 0x0 0x2000>;
Signature · 1 line
2.17.1
Guillaume La Roque
maintainerPATCH v4 4/6 arm64: dts: meson: sei510: Add minimal thermal zone
In reply to Guillaume La RoqueAdd minimal thermal zone for two temperature sensor One is located close to the DDR and the other one is located close to the PLLs (between the CPU and GPU)
--- .../boot/dts/amlogic/meson-g12a-sei510.dts | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +70 -0
@@ -10,6 +10,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/gpio/meson-g12a-gpio.h> #include <dt-bindings/sound/meson-g12a-tohdmitx.h> +#include <dt-bindings/thermal/thermal.h> / { compatible = "seirobotics,sei510", "amlogic,g12a";
@@ -33,6 +34,67 @@ ethernet0 = ðmac; }; + thermal-zones { + cpu-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&cpu_temp>; + + trips { + cpu_hot: cpu-hot { + temperature = <85000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "hot"; + }; + + cpu_critical: cpu-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_hot>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + map1 { + trip = <&cpu_critical>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + ddr-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&ddr_temp>; + + trips { + ddr_critical: ddr-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map { + trip = <&ddr_critical>; + cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; + mono_dac: audio-codec-0 { compatible = "maxim,max98357a"; #sound-dai-cells = <0>;
@@ -321,6 +383,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu1 {
@@ -328,6 +391,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu2 {
@@ -335,6 +399,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu3 {
@@ -342,6 +407,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cvbs_vdac_port {
@@ -368,6 +434,10 @@ status = "okay"; }; +&mali { + #cooling-cells = <2>; +}; + &hdmi_tx { status = "okay"; pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
Signature · 1 line
2.17.1
Kevin Hilman
maintainerRe: [PATCH v4 4/6] arm64: dts: meson: sei510: Add minimal thermal zone
Quoted 123 lines · Guillaume La Roque
Add minimal thermal zone for two temperature sensor One is located close to the DDR and the other one is located close to the PLLs (between the CPU and GPU)
Signed-off-by Guillaume La Roque <[email protected]>--- .../boot/dts/amlogic/meson-g12a-sei510.dts | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+)arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +66
-0@@ -10,6 +10,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/gpio/meson-g12a-gpio.h> #include <dt-bindings/sound/meson-g12a-tohdmitx.h> +#include <dt-bindings/thermal/thermal.h> / { compatible = "seirobotics,sei510", "amlogic,g12a";@@ -33,6 +34,67 @@ ethernet0 = ðmac; }; + thermal-zones { + cpu-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&cpu_temp>; + + trips { + cpu_hot: cpu-hot { + temperature = <85000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "hot"; + }; + + cpu_critical: cpu-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_hot>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + map1 { + trip = <&cpu_critical>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + ddr-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&ddr_temp>; + + trips { + ddr_critical: ddr-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map { + trip = <&ddr_critical>; + cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; + mono_dac: audio-codec-0 { compatible = "maxim,max98357a"; #sound-dai-cells = <0>;@@ -321,6 +383,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu1 {@@ -328,6 +391,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu2 {@@ -335,6 +399,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu3 {@@ -342,6 +407,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cvbs_vdac_port {
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts line 440
Quoted 7 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +4
-0@@ -368,6 +434,10 @@ status = "okay"; }; +&mali { + #cooling-cells = <2>; +}; +
Is there a reason these #cooling-cells properties belong in the SoC .dtsi and not the board .dts. Seems like you'll have to repeat this in every board .dts which doesn't seem necessary.
Same comment for patch 5/6
Kevin
Re: [PATCH v4 4/6] arm64: dts: meson: sei510: Add minimal thermal zone
Quoted 128 lines · Kevin Hilman
Quoted 126 lines · Guillaume La Roque
Add minimal thermal zone for two temperature sensor One is located close to the DDR and the other one is located close to the PLLs (between the CPU and GPU)
Signed-off-by Guillaume La Roque <[email protected]>--- .../boot/dts/amlogic/meson-g12a-sei510.dts | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+)arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +66
-0@@ -10,6 +10,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/gpio/meson-g12a-gpio.h> #include <dt-bindings/sound/meson-g12a-tohdmitx.h> +#include <dt-bindings/thermal/thermal.h> / { compatible = "seirobotics,sei510", "amlogic,g12a";@@ -33,6 +34,67 @@ ethernet0 = ðmac; }; + thermal-zones { + cpu-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&cpu_temp>; + + trips { + cpu_hot: cpu-hot { + temperature = <85000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "hot"; + }; + + cpu_critical: cpu-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_hot>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + map1 { + trip = <&cpu_critical>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + ddr-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&ddr_temp>; + + trips { + ddr_critical: ddr-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map { + trip = <&ddr_critical>; + cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; + mono_dac: audio-codec-0 { compatible = "maxim,max98357a"; #sound-dai-cells = <0>;@@ -321,6 +383,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu1 {@@ -328,6 +391,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu2 {@@ -335,6 +399,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu3 {@@ -342,6 +407,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cvbs_vdac_port {@@ -368,6 +434,10 @@ status = "okay"; };
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts line 440
Quoted 4 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +4
-0+&mali { + #cooling-cells = <2>; +}; +Is there a reason these #cooling-cells properties belong in the SoC .dtsi and not the board .dts. Seems like you'll have to repeat this in every board .dts which doesn't seem necessary.
I asked him to keep the cooling-cells in the boards until we add the thermal in all the remaining boards.
Seemed to be safer way at the time...
Neil
Quoted 10 lines
Same comment for patch 5/6
Kevin
_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Kevin Hilman
maintainerRe: [PATCH v4 4/6] arm64: dts: meson: sei510: Add minimal thermal zone
Quoted 138 lines · Neil Armstrong
Quoted 128 lines · Kevin Hilman
Quoted 126 lines · Guillaume La Roque
Add minimal thermal zone for two temperature sensor One is located close to the DDR and the other one is located close to the PLLs (between the CPU and GPU)
Signed-off-by Guillaume La Roque <[email protected]>--- .../boot/dts/amlogic/meson-g12a-sei510.dts | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+)arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +66
-0@@ -10,6 +10,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/gpio/meson-g12a-gpio.h> #include <dt-bindings/sound/meson-g12a-tohdmitx.h> +#include <dt-bindings/thermal/thermal.h> / { compatible = "seirobotics,sei510", "amlogic,g12a";@@ -33,6 +34,67 @@ ethernet0 = ðmac; }; + thermal-zones { + cpu-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&cpu_temp>; + + trips { + cpu_hot: cpu-hot { + temperature = <85000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "hot"; + }; + + cpu_critical: cpu-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_hot>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + map1 { + trip = <&cpu_critical>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + ddr-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&ddr_temp>; + + trips { + ddr_critical: ddr-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map { + trip = <&ddr_critical>; + cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; + mono_dac: audio-codec-0 { compatible = "maxim,max98357a"; #sound-dai-cells = <0>;@@ -321,6 +383,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu1 {@@ -328,6 +391,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu2 {@@ -335,6 +399,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu3 {@@ -342,6 +407,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cvbs_vdac_port {@@ -368,6 +434,10 @@ status = "okay"; };Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts line 440
Quoted 4 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +4
-0+&mali { + #cooling-cells = <2>; +}; +Is there a reason these #cooling-cells properties belong in the SoC .dtsi and not the board .dts. Seems like you'll have to repeat this in every board .dts which doesn't seem necessary.
Quoted 4 lines
I asked him to keep the cooling-cells in the boards until we add the thermal in all the remaining boards.
Seemed to be safer way at the time...
I assumed that #cooling-cells alone would be harmless.
If there are no thermal-zones with trips/maps defined, what can #cooling-cells by itself do?
Kevin
Re: [PATCH v4 4/6] arm64: dts: meson: sei510: Add minimal thermal zone
In reply to Kevin HilmanQuoted 29 lines · Kevin Hilman
Quoted 26 lines · Guillaume La Roque
Add minimal thermal zone for two temperature sensor One is located close to the DDR and the other one is located close to the PLLs (between the CPU and GPU)
Signed-off-by Guillaume La Roque <[email protected]>--- .../boot/dts/amlogic/meson-g12a-sei510.dts | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+)arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +1
-0@@ -10,6 +10,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/gpio/meson-g12a-gpio.h> #include <dt-bindings/sound/meson-g12a-tohdmitx.h> +#include <dt-bindings/thermal/thermal.h> / { compatible = "seirobotics,sei510", "amlogic,g12a";@@ -33,6 +34,67 @@ ethernet0 = ðmac; };
Quoted 12 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts line 48
Quoted 12 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +12
-0+ thermal-zones { + cpu-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&cpu_temp>; + + trips { + cpu_hot: cpu-hot { + temperature = <85000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "hot"; + };
No passive trip point? That is where the cooling-maps are really useful.
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts line 56
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +8
-0+ + cpu_critical: cpu-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; +
I think, what you really want is to change your hot trip point above to passive. And if you need another trip before that (to send notification to userspace, for example), just add another hot trip point at a lower temperature.
Quoted 8 lines
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +8
-0+ cooling-maps { + map0 { + trip = <&cpu_hot>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + };
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts line 72
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +8
-0+ + map1 { + trip = <&cpu_critical>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + };
The cooling-map associated with a critical trip point is of no use in my experience because the device is already on its way to shutting down then.
Quoted 12 lines
Quoted 12 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +12
-0+ }; + }; + + ddr-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&ddr_temp>; + + trips { + ddr_critical: ddr-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts line 92
Quoted 8 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +8
-0+ type = "critical"; + }; + }; + + cooling-maps { + map { + trip = <&ddr_critical>; + cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
Same here. The cooling-map makes more sense against a passive trip type.
Quoted 53 lines
Quoted 41 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +9
-0+ }; + }; + }; + }; + mono_dac: audio-codec-0 { compatible = "maxim,max98357a"; #sound-dai-cells = <0>;@@ -321,6 +383,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu1 {@@ -328,6 +391,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu2 {@@ -335,6 +399,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu3 {@@ -342,6 +407,7 @@ operating-points-v2 = <&cpu_opp_table>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cvbs_vdac_port {arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts line 440
Quoted 7 lines
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts +4
-0@@ -368,6 +434,10 @@ status = "okay"; }; +&mali { + #cooling-cells = <2>; +}; +Is there a reason these #cooling-cells properties belong in the SoC .dtsi and not the board .dts. Seems like you'll have to repeat this in every board .dts which doesn't seem necessary.
Quoted 1 line
Same comment for patch 5/6
Agreed. Even the thermal zones belong in the SoC .dtsi. You can always override the trip-points in a board .dts if required if you have a board designed in a different form-factor or with active cooling.
/Amit
Guillaume La Roque
maintainerPATCH v4 5/6 arm64: dts: amlogic: odroid-n2: add minimal thermal zone
In reply to Guillaume La RoqueAdd minimal thermal zone for two temperature sensor One is located close to the DDR and the other one is located close to the PLLs (between the CPU and GPU)
--- .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 76 +++++++++++++++++++ 1 file changed, 76 insertions(+)
arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts +76 -0
@@ -10,6 +10,7 @@ #include <dt-bindings/input/input.h> #include <dt-bindings/gpio/meson-g12a-gpio.h> #include <dt-bindings/sound/meson-g12a-tohdmitx.h> +#include <dt-bindings/thermal/thermal.h> / { compatible = "hardkernel,odroid-n2", "amlogic,g12b";
@@ -20,6 +21,71 @@ ethernet0 = ðmac; }; + thermal-zones { + cpu-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&cpu_temp>; + + trips { + cpu_hot: cpu-hot { + temperature = <85000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "hot"; + }; + + cpu_critical: cpu-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map0 { + trip = <&cpu_hot>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + + map1 { + trip = <&cpu_critical>; + cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, + <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + + ddr-thermal { + polling-delay = <1000>; + polling-delay-passive = <100>; + thermal-sensors = <&ddr_temp>; + + trips { + ddr_critical: ddr-critical { + temperature = <110000>; /* millicelsius */ + hysteresis = <2000>; /* millicelsius */ + type = "critical"; + }; + }; + + cooling-maps { + map { + trip = <&ddr_critical>; + cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + }; + }; + }; + }; + chosen { stdout-path = "serial0:115200n8"; };
@@ -289,6 +355,7 @@ operating-points-v2 = <&cpu_opp_table_0>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu1 {
@@ -296,6 +363,7 @@ operating-points-v2 = <&cpu_opp_table_0>; clocks = <&clkc CLKID_CPU_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu100 {
@@ -303,6 +371,7 @@ operating-points-v2 = <&cpub_opp_table_1>; clocks = <&clkc CLKID_CPUB_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu101 {
@@ -310,6 +379,7 @@ operating-points-v2 = <&cpub_opp_table_1>; clocks = <&clkc CLKID_CPUB_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu102 {
@@ -317,6 +387,7 @@ operating-points-v2 = <&cpub_opp_table_1>; clocks = <&clkc CLKID_CPUB_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &cpu103 {
@@ -324,6 +395,7 @@ operating-points-v2 = <&cpub_opp_table_1>; clocks = <&clkc CLKID_CPUB_CLK>; clock-latency = <50000>; + #cooling-cells = <2>; }; &ext_mdio {
@@ -378,6 +450,10 @@ }; }; +&mali { + #cooling-cells = <2>; +}; + &hdmi_tx { status = "okay"; pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
Signature · 1 line
2.17.1
Guillaume La Roque
maintainerPATCH v4 6/6 MAINTAINERS: add entry for Amlogic Thermal driver
In reply to Guillaume La RoqueAdd myself as maintainer for Amlogic Thermal driver.
--- MAINTAINERS | 9 +++++++++ 1 file changed, 9 insertions(+)
MAINTAINERS +9 -0
@@ -15910,6 +15910,15 @@ F: Documentation/driver-api/thermal/cpu-cooling-api.rst F: drivers/thermal/cpu_cooling.c F: include/linux/cpu_cooling.h +THERMAL DRIVER FOR AMLOGIC SOCS +M: Guillaume La Roque <[email protected]> +L: [email protected] +L: [email protected] +W: http://linux-meson.com/ +S: Supported +F: drivers/thermal/amlogic_thermal.c +F: Documentation/devicetree/bindings/thermal/amlogic,thermal.yaml + THINKPAD ACPI EXTRAS DRIVER M: Henrique de Moraes Holschuh <[email protected]> L: [email protected]
Signature · 1 line
2.17.1
Kevin Hilman
maintainerQuoted 34 lines · Guillaume La Roque
This patchs series add support of New Amlogic temperature sensor and minimal thermal zone for SEI510 and ODROID-N2 boards.
First implementation was doing on IIO[1] but after comments i move on thermal framework. Formulas and calibration values come from amlogic.
Changes since v3:
- Add cooling map and trip point for hot type
- move compatible on g12a instead of g12 to be aligned with others
- add all reviewer, sorry for this mistakeChanges since v2:
- fix yaml documention
- remove unneeded status variable for temperature-sensor node
- rework driver after Martin review
- add some information in commit messageChanges since v1:
- fix enum vs const in documentation
- fix error with thermal-sensor-cells value set to 1 instead of 0
- add some dependencies needed to add cooling-mapsDependencies :
- patch 3,4 & 5: depends on Neil's patch and series :
- missing dwc2 phy-names[2]
- patchsets to add DVFS on G12a[3] which have deps on [4] and [5][1] https://lore.kernel.org/linux-amlogic/[email protected]/
[2] https://lore.kernel.org/linux-amlogic/[email protected]/
[3] https://lore.kernel.org/linux-amlogic/[email protected]/
[4] https://lore.kernel.org/linux-amlogic/[email protected]/
[5] https://lore.kernel.org/linux-amlogic/[email protected]/
Quoted 2 lines
Tested-by Christian Hewitt <[email protected]>Tested-by Kevin Hilman <[email protected]>
nit: you should put these on the individual patches, since the cover letter does not get applied to any tree, any tags here get lost.
Kevin