arm64: dts: mediatek: mt8183: Move thermal-zones to the root node

commit 5a60d63439694590cd5ab1f998fc917ff7ba1c1d upstream.

The thermal zones are not a soc bus device: move it to the root
node to solve simple_bus_reg warnings.

Cc: stable@vger.kernel.org
Fixes: b325ce39785b ("arm64: dts: mt8183: add thermal zone node")
Link: https://lore.kernel.org/r/20231025093816.44327-9-angelogioacchino.delregno@collabora.com
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
index 268a1f2..10779a9 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
@@ -1136,127 +1136,6 @@
                        nvmem-cell-names = "calibration-data";
                };
 
-               thermal_zones: thermal-zones {
-                       cpu_thermal: cpu-thermal {
-                               polling-delay-passive = <100>;
-                               polling-delay = <500>;
-                               thermal-sensors = <&thermal 0>;
-                               sustainable-power = <5000>;
-
-                               trips {
-                                       threshold: trip-point0 {
-                                               temperature = <68000>;
-                                               hysteresis = <2000>;
-                                               type = "passive";
-                                       };
-
-                                       target: trip-point1 {
-                                               temperature = <80000>;
-                                               hysteresis = <2000>;
-                                               type = "passive";
-                                       };
-
-                                       cpu_crit: cpu-crit {
-                                               temperature = <115000>;
-                                               hysteresis = <2000>;
-                                               type = "critical";
-                                       };
-                               };
-
-                               cooling-maps {
-                                       map0 {
-                                               trip = <&target>;
-                                               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>;
-                                               contribution = <3072>;
-                                       };
-                                       map1 {
-                                               trip = <&target>;
-                                               cooling-device = <&cpu4
-                                                       THERMAL_NO_LIMIT
-                                                       THERMAL_NO_LIMIT>,
-                                                                <&cpu5
-                                                       THERMAL_NO_LIMIT
-                                                       THERMAL_NO_LIMIT>,
-                                                                <&cpu6
-                                                       THERMAL_NO_LIMIT
-                                                       THERMAL_NO_LIMIT>,
-                                                                <&cpu7
-                                                       THERMAL_NO_LIMIT
-                                                       THERMAL_NO_LIMIT>;
-                                               contribution = <1024>;
-                                       };
-                               };
-                       };
-
-                       /* The tzts1 ~ tzts6 don't need to polling */
-                       /* The tzts1 ~ tzts6 don't need to thermal throttle */
-
-                       tzts1: tzts1 {
-                               polling-delay-passive = <0>;
-                               polling-delay = <0>;
-                               thermal-sensors = <&thermal 1>;
-                               sustainable-power = <5000>;
-                               trips {};
-                               cooling-maps {};
-                       };
-
-                       tzts2: tzts2 {
-                               polling-delay-passive = <0>;
-                               polling-delay = <0>;
-                               thermal-sensors = <&thermal 2>;
-                               sustainable-power = <5000>;
-                               trips {};
-                               cooling-maps {};
-                       };
-
-                       tzts3: tzts3 {
-                               polling-delay-passive = <0>;
-                               polling-delay = <0>;
-                               thermal-sensors = <&thermal 3>;
-                               sustainable-power = <5000>;
-                               trips {};
-                               cooling-maps {};
-                       };
-
-                       tzts4: tzts4 {
-                               polling-delay-passive = <0>;
-                               polling-delay = <0>;
-                               thermal-sensors = <&thermal 4>;
-                               sustainable-power = <5000>;
-                               trips {};
-                               cooling-maps {};
-                       };
-
-                       tzts5: tzts5 {
-                               polling-delay-passive = <0>;
-                               polling-delay = <0>;
-                               thermal-sensors = <&thermal 5>;
-                               sustainable-power = <5000>;
-                               trips {};
-                               cooling-maps {};
-                       };
-
-                       tztsABB: tztsABB {
-                               polling-delay-passive = <0>;
-                               polling-delay = <0>;
-                               thermal-sensors = <&thermal 6>;
-                               sustainable-power = <5000>;
-                               trips {};
-                               cooling-maps {};
-                       };
-               };
-
                pwm0: pwm@1100e000 {
                        compatible = "mediatek,mt8183-disp-pwm";
                        reg = <0 0x1100e000 0 0x1000>;
@@ -2031,4 +1910,125 @@
                        power-domains = <&spm MT8183_POWER_DOMAIN_CAM>;
                };
        };
+
+       thermal_zones: thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <100>;
+                       polling-delay = <500>;
+                       thermal-sensors = <&thermal 0>;
+                       sustainable-power = <5000>;
+
+                       trips {
+                               threshold: trip-point0 {
+                                       temperature = <68000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               target: trip-point1 {
+                                       temperature = <80000>;
+                                       hysteresis = <2000>;
+                                       type = "passive";
+                               };
+
+                               cpu_crit: cpu-crit {
+                                       temperature = <115000>;
+                                       hysteresis = <2000>;
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               map0 {
+                                       trip = <&target>;
+                                       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>;
+                                       contribution = <3072>;
+                               };
+                               map1 {
+                                       trip = <&target>;
+                                       cooling-device = <&cpu4
+                                               THERMAL_NO_LIMIT
+                                               THERMAL_NO_LIMIT>,
+                                                        <&cpu5
+                                               THERMAL_NO_LIMIT
+                                               THERMAL_NO_LIMIT>,
+                                                        <&cpu6
+                                               THERMAL_NO_LIMIT
+                                               THERMAL_NO_LIMIT>,
+                                                        <&cpu7
+                                               THERMAL_NO_LIMIT
+                                               THERMAL_NO_LIMIT>;
+                                       contribution = <1024>;
+                               };
+                       };
+               };
+
+               /* The tzts1 ~ tzts6 don't need to polling */
+               /* The tzts1 ~ tzts6 don't need to thermal throttle */
+
+               tzts1: tzts1 {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&thermal 1>;
+                       sustainable-power = <5000>;
+                       trips {};
+                       cooling-maps {};
+               };
+
+               tzts2: tzts2 {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&thermal 2>;
+                       sustainable-power = <5000>;
+                       trips {};
+                       cooling-maps {};
+               };
+
+               tzts3: tzts3 {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&thermal 3>;
+                       sustainable-power = <5000>;
+                       trips {};
+                       cooling-maps {};
+               };
+
+               tzts4: tzts4 {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&thermal 4>;
+                       sustainable-power = <5000>;
+                       trips {};
+                       cooling-maps {};
+               };
+
+               tzts5: tzts5 {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&thermal 5>;
+                       sustainable-power = <5000>;
+                       trips {};
+                       cooling-maps {};
+               };
+
+               tztsABB: tztsABB {
+                       polling-delay-passive = <0>;
+                       polling-delay = <0>;
+                       thermal-sensors = <&thermal 6>;
+                       sustainable-power = <5000>;
+                       trips {};
+                       cooling-maps {};
+               };
+       };
 };