ARM: dts: ls1021a: move thermal-zones node out of soc/
authorLi Yang <leoyang.li@nxp.com>
Tue, 12 Oct 2021 23:58:22 +0000 (18:58 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Nov 2021 09:39:10 +0000 (10:39 +0100)
[ Upstream commit 1ee1500ef717eefb5d9bdaf97905cb81b4e69aa4 ]

This fixes dtbs-check error from simple-bus schema:
soc: thermal-zones: {'type': 'object'} is not allowed for {'cpu-thermal': ..... }
        From schema: /home/leo/.local/lib/python3.8/site-packages/dtschema/schemas/simple-bus.yaml

Signed-off-by: Li Yang <leoyang.li@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/ls1021a.dtsi

index 827373e..37026b2 100644 (file)
                        #thermal-sensor-cells = <1>;
                };
 
-               thermal-zones {
-                       cpu_thermal: cpu-thermal {
-                               polling-delay-passive = <1000>;
-                               polling-delay = <5000>;
-
-                               thermal-sensors = <&tmu 0>;
-
-                               trips {
-                                       cpu_alert: cpu-alert {
-                                               temperature = <85000>;
-                                               hysteresis = <2000>;
-                                               type = "passive";
-                                       };
-                                       cpu_crit: cpu-crit {
-                                               temperature = <95000>;
-                                               hysteresis = <2000>;
-                                               type = "critical";
-                                       };
-                               };
-
-                               cooling-maps {
-                                       map0 {
-                                               trip = <&cpu_alert>;
-                                               cooling-device =
-                                                       <&cpu0 THERMAL_NO_LIMIT
-                                                       THERMAL_NO_LIMIT>,
-                                                       <&cpu1 THERMAL_NO_LIMIT
-                                                       THERMAL_NO_LIMIT>;
-                                       };
-                               };
-                       };
-               };
-
                dspi0: spi@2100000 {
                        compatible = "fsl,ls1021a-v1.0-dspi";
                        #address-cells = <1>;
                        big-endian;
                };
        };
+
+       thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <1000>;
+                       polling-delay = <5000>;
+
+                       thermal-sensors = <&tmu 0>;
+
+                       trips {
+                               cpu_alert: cpu-alert {
+                                       temperature = <85000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+                               cpu_crit: cpu-crit {
+                                       temperature = <95000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               map0 {
+                                       trip = <&cpu_alert>;
+                                       cooling-device =
+                                               <&cpu0 THERMAL_NO_LIMIT
+                                               THERMAL_NO_LIMIT>,
+                                               <&cpu1 THERMAL_NO_LIMIT
+                                               THERMAL_NO_LIMIT>;
+                               };
+                       };
+               };
+       };
 };