On 26/10/2021 20:28, Alexander Stein wrote:
> This node is currently at /soc/thermal-zones, but the later introduced
> bindings in commit 1202a442a31f ("dt-bindings: thermal: Add yaml bindings
> for thermal zones") put this at /thermal-zones.
> Fix dtb_check warning by moving the thermal-zones node to /
>
> Signed-off-by: Alexander Stein <alexander.stein@xxxxxxxxxxx>
> ---
> Changes in v2:
> * Separated from DT bindings patch in v1 (PATCH 1/4)
> * Dropped the Fixes tag
>
> .../boot/dts/amlogic/meson-g12-common.dtsi | 110 +++++++++---------
> 1 file changed, 55 insertions(+), 55 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> index 00c6f53290d4..ff987e7ccff2 100644
> --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
> @@ -159,61 +159,6 @@ &clkc CLKID_PCIE_COMB
> status = "disabled";
> };
>
> - thermal-zones {
> - cpu_thermal: cpu-thermal {
> - polling-delay = <1000>;
> - polling-delay-passive = <100>;
> - thermal-sensors = <&cpu_temp>;
> -
> - trips {
> - cpu_passive: cpu-passive {
> - temperature = <85000>; /* millicelsius */
> - hysteresis = <2000>; /* millicelsius */
> - type = "passive";
> - };
> -
> - cpu_hot: cpu-hot {
> - temperature = <95000>; /* millicelsius */
> - hysteresis = <2000>; /* millicelsius */
> - type = "hot";
> - };
> -
> - cpu_critical: cpu-critical {
> - temperature = <110000>; /* millicelsius */
> - hysteresis = <2000>; /* millicelsius */
> - type = "critical";
> - };
> - };
> - };
> -
> - ddr_thermal: ddr-thermal {
> - polling-delay = <1000>;
> - polling-delay-passive = <100>;
> - thermal-sensors = <&ddr_temp>;
> -
> - trips {
> - ddr_passive: ddr-passive {
> - temperature = <85000>; /* millicelsius */
> - hysteresis = <2000>; /* millicelsius */
> - type = "passive";
> - };
> -
> - ddr_critical: ddr-critical {
> - temperature = <110000>; /* millicelsius */
> - hysteresis = <2000>; /* millicelsius */
> - type = "critical";
> - };
> - };
> -
> - cooling-maps {
> - map {
> - trip = <&ddr_passive>;
> - cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> - };
> - };
> - };
> - };
> -
> ethmac: ethernet@ff3f0000 {
> compatible = "amlogic,meson-g12a-dwmac",
> "snps,dwmac-3.70a",
> @@ -2415,6 +2360,61 @@ mali: gpu@ffe40000 {
> };
> };
>
> + thermal-zones {
> + cpu_thermal: cpu-thermal {
> + polling-delay = <1000>;
> + polling-delay-passive = <100>;
> + thermal-sensors = <&cpu_temp>;
> +
> + trips {
> + cpu_passive: cpu-passive {
> + temperature = <85000>; /* millicelsius */
> + hysteresis = <2000>; /* millicelsius */
> + type = "passive";
> + };
> +
> + cpu_hot: cpu-hot {
> + temperature = <95000>; /* millicelsius */
> + hysteresis = <2000>; /* millicelsius */
> + type = "hot";
> + };
> +
> + cpu_critical: cpu-critical {
> + temperature = <110000>; /* millicelsius */
> + hysteresis = <2000>; /* millicelsius */
> + type = "critical";
> + };
> + };
> + };
> +
> + ddr_thermal: ddr-thermal {
> + polling-delay = <1000>;
> + polling-delay-passive = <100>;
> + thermal-sensors = <&ddr_temp>;
> +
> + trips {
> + ddr_passive: ddr-passive {
> + temperature = <85000>; /* millicelsius */
> + hysteresis = <2000>; /* millicelsius */
> + type = "passive";
> + };
> +
> + ddr_critical: ddr-critical {
> + temperature = <110000>; /* millicelsius */
> + hysteresis = <2000>; /* millicelsius */
> + type = "critical";
> + };
> + };
> +
> + cooling-maps {
> + map {
> + trip = <&ddr_passive>;
> + cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
> + };
> + };
> + };
> + };
> +
> timer {
> compatible = "arm,armv8-timer";
> interrupts = <GIC_PPI 13
>
Reviewed-by: Neil Armstrong <narmstrong@xxxxxxxxxxxx>
