Commit cdc50916 authored by Alexander Stein's avatar Alexander Stein Committed by Neil Armstrong
Browse files

arm64: dts: amlogic: meson-g12: Fix thermal-zones indent 



This node is currently at /soc/thermal-zones, but the later introduced
bindings in commit 1202a442 ("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: default avatarAlexander Stein <alexander.stein@mailbox.org>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://lore.kernel.org/r/20211026182813.900775-1-alexander.stein@mailbox.org
parent 83c9eee7

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+55 −55
Original line number Diff line number Diff line
@@ -159,61 +159,6 @@ 
			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 @@ 
		};

	};



	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