diff mbox series

[2/4] arm64: dts: amlogic: meson-g12: Fix thermal-zones indent

Message ID 20211023214856.30097-2-alexander.stein@mailbox.org (mailing list archive)
State New, archived
Headers show
Series [1/4] dt-bindings: sound: amlogic: t9015: Add missing AVDD-supply property | expand

Commit Message

Alexander Stein Oct. 23, 2021, 9:48 p.m. UTC
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 /

Fixes: e7251ed74ef7 ("arm64: dts: meson: g12: Add minimal thermal zone")
Signed-off-by: Alexander Stein <alexander.stein@mailbox.org>
---
I admit I'm a bit unsure about the 'Fixes' tag as at the time when those
thermal-zones were added there was no schema present. So there was no bug at
the time of writing. I'm ok either way.

 .../boot/dts/amlogic/meson-g12-common.dtsi    | 110 +++++++++---------
 1 file changed, 55 insertions(+), 55 deletions(-)

Comments

Neil Armstrong Oct. 26, 2021, 7:27 a.m. UTC | #1
Hi,

On 23/10/2021 23:48, 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 /
> 
> Fixes: e7251ed74ef7 ("arm64: dts: meson: g12: Add minimal thermal zone")
> Signed-off-by: Alexander Stein <alexander.stein@mailbox.org>
> ---
> I admit I'm a bit unsure about the 'Fixes' tag as at the time when those
> thermal-zones were added there was no schema present. So there was no bug at
> the time of writing. I'm ok either way.

I'm also unsure about it, either you list all commits that must be present for the fix to be applied,
or remove it since it's not a bug.

Neil

> 
>  .../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
>
Alexander Stein Oct. 26, 2021, 4:21 p.m. UTC | #2
Hello,

Am Dienstag, 26. Oktober 2021, 09:27:42 CEST schrieb Neil Armstrong:
> On 23/10/2021 23:48, 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 /
> > 
> > Fixes: e7251ed74ef7 ("arm64: dts: meson: g12: Add minimal thermal zone")
> > Signed-off-by: Alexander Stein <alexander.stein@mailbox.org>
> > ---
> > I admit I'm a bit unsure about the 'Fixes' tag as at the time when those
> > thermal-zones were added there was no schema present. So there was no bug
> > at the time of writing. I'm ok either way.
> 
> I'm also unsure about it, either you list all commits that must be present
> for the fix to be applied, or remove it since it's not a bug.

Alright, I'll remove the Fixes tag then and send a v2 with your Reviewed-By 
for patches 3 & 4.

Best regards,
Alexander
diff mbox series

Patch

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