Skip to content

Commit 5a60d63

Browse files
author
AngeloGioacchino Del Regno
committed
arm64: dts: mediatek: mt8183: Move thermal-zones to the root node
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: b325ce3 ("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>
1 parent 24165c5 commit 5a60d63

1 file changed

Lines changed: 121 additions & 121 deletions

File tree

‎arch/arm64/boot/dts/mediatek/mt8183.dtsi‎

Lines changed: 121 additions & 121 deletions
Original file line numberDiff line numberDiff line change
@@ -1210,127 +1210,6 @@
12101210
nvmem-cell-names = "calibration-data";
12111211
};
12121212

1213-
thermal_zones: thermal-zones {
1214-
cpu_thermal: cpu-thermal {
1215-
polling-delay-passive = <100>;
1216-
polling-delay = <500>;
1217-
thermal-sensors = <&thermal 0>;
1218-
sustainable-power = <5000>;
1219-
1220-
trips {
1221-
threshold: trip-point0 {
1222-
temperature = <68000>;
1223-
hysteresis = <2000>;
1224-
type = "passive";
1225-
};
1226-
1227-
target: trip-point1 {
1228-
temperature = <80000>;
1229-
hysteresis = <2000>;
1230-
type = "passive";
1231-
};
1232-
1233-
cpu_crit: cpu-crit {
1234-
temperature = <115000>;
1235-
hysteresis = <2000>;
1236-
type = "critical";
1237-
};
1238-
};
1239-
1240-
cooling-maps {
1241-
map0 {
1242-
trip = <&target>;
1243-
cooling-device = <&cpu0
1244-
THERMAL_NO_LIMIT
1245-
THERMAL_NO_LIMIT>,
1246-
<&cpu1
1247-
THERMAL_NO_LIMIT
1248-
THERMAL_NO_LIMIT>,
1249-
<&cpu2
1250-
THERMAL_NO_LIMIT
1251-
THERMAL_NO_LIMIT>,
1252-
<&cpu3
1253-
THERMAL_NO_LIMIT
1254-
THERMAL_NO_LIMIT>;
1255-
contribution = <3072>;
1256-
};
1257-
map1 {
1258-
trip = <&target>;
1259-
cooling-device = <&cpu4
1260-
THERMAL_NO_LIMIT
1261-
THERMAL_NO_LIMIT>,
1262-
<&cpu5
1263-
THERMAL_NO_LIMIT
1264-
THERMAL_NO_LIMIT>,
1265-
<&cpu6
1266-
THERMAL_NO_LIMIT
1267-
THERMAL_NO_LIMIT>,
1268-
<&cpu7
1269-
THERMAL_NO_LIMIT
1270-
THERMAL_NO_LIMIT>;
1271-
contribution = <1024>;
1272-
};
1273-
};
1274-
};
1275-
1276-
/* The tzts1 ~ tzts6 don't need to polling */
1277-
/* The tzts1 ~ tzts6 don't need to thermal throttle */
1278-
1279-
tzts1: tzts1 {
1280-
polling-delay-passive = <0>;
1281-
polling-delay = <0>;
1282-
thermal-sensors = <&thermal 1>;
1283-
sustainable-power = <5000>;
1284-
trips {};
1285-
cooling-maps {};
1286-
};
1287-
1288-
tzts2: tzts2 {
1289-
polling-delay-passive = <0>;
1290-
polling-delay = <0>;
1291-
thermal-sensors = <&thermal 2>;
1292-
sustainable-power = <5000>;
1293-
trips {};
1294-
cooling-maps {};
1295-
};
1296-
1297-
tzts3: tzts3 {
1298-
polling-delay-passive = <0>;
1299-
polling-delay = <0>;
1300-
thermal-sensors = <&thermal 3>;
1301-
sustainable-power = <5000>;
1302-
trips {};
1303-
cooling-maps {};
1304-
};
1305-
1306-
tzts4: tzts4 {
1307-
polling-delay-passive = <0>;
1308-
polling-delay = <0>;
1309-
thermal-sensors = <&thermal 4>;
1310-
sustainable-power = <5000>;
1311-
trips {};
1312-
cooling-maps {};
1313-
};
1314-
1315-
tzts5: tzts5 {
1316-
polling-delay-passive = <0>;
1317-
polling-delay = <0>;
1318-
thermal-sensors = <&thermal 5>;
1319-
sustainable-power = <5000>;
1320-
trips {};
1321-
cooling-maps {};
1322-
};
1323-
1324-
tztsABB: tztsABB {
1325-
polling-delay-passive = <0>;
1326-
polling-delay = <0>;
1327-
thermal-sensors = <&thermal 6>;
1328-
sustainable-power = <5000>;
1329-
trips {};
1330-
cooling-maps {};
1331-
};
1332-
};
1333-
13341213
pwm0: pwm@1100e000 {
13351214
compatible = "mediatek,mt8183-disp-pwm";
13361215
reg = <0 0x1100e000 0 0x1000>;
@@ -2105,4 +1984,125 @@
21051984
power-domains = <&spm MT8183_POWER_DOMAIN_CAM>;
21061985
};
21071986
};
1987+
1988+
thermal_zones: thermal-zones {
1989+
cpu_thermal: cpu-thermal {
1990+
polling-delay-passive = <100>;
1991+
polling-delay = <500>;
1992+
thermal-sensors = <&thermal 0>;
1993+
sustainable-power = <5000>;
1994+
1995+
trips {
1996+
threshold: trip-point0 {
1997+
temperature = <68000>;
1998+
hysteresis = <2000>;
1999+
type = "passive";
2000+
};
2001+
2002+
target: trip-point1 {
2003+
temperature = <80000>;
2004+
hysteresis = <2000>;
2005+
type = "passive";
2006+
};
2007+
2008+
cpu_crit: cpu-crit {
2009+
temperature = <115000>;
2010+
hysteresis = <2000>;
2011+
type = "critical";
2012+
};
2013+
};
2014+
2015+
cooling-maps {
2016+
map0 {
2017+
trip = <&target>;
2018+
cooling-device = <&cpu0
2019+
THERMAL_NO_LIMIT
2020+
THERMAL_NO_LIMIT>,
2021+
<&cpu1
2022+
THERMAL_NO_LIMIT
2023+
THERMAL_NO_LIMIT>,
2024+
<&cpu2
2025+
THERMAL_NO_LIMIT
2026+
THERMAL_NO_LIMIT>,
2027+
<&cpu3
2028+
THERMAL_NO_LIMIT
2029+
THERMAL_NO_LIMIT>;
2030+
contribution = <3072>;
2031+
};
2032+
map1 {
2033+
trip = <&target>;
2034+
cooling-device = <&cpu4
2035+
THERMAL_NO_LIMIT
2036+
THERMAL_NO_LIMIT>,
2037+
<&cpu5
2038+
THERMAL_NO_LIMIT
2039+
THERMAL_NO_LIMIT>,
2040+
<&cpu6
2041+
THERMAL_NO_LIMIT
2042+
THERMAL_NO_LIMIT>,
2043+
<&cpu7
2044+
THERMAL_NO_LIMIT
2045+
THERMAL_NO_LIMIT>;
2046+
contribution = <1024>;
2047+
};
2048+
};
2049+
};
2050+
2051+
/* The tzts1 ~ tzts6 don't need to polling */
2052+
/* The tzts1 ~ tzts6 don't need to thermal throttle */
2053+
2054+
tzts1: tzts1 {
2055+
polling-delay-passive = <0>;
2056+
polling-delay = <0>;
2057+
thermal-sensors = <&thermal 1>;
2058+
sustainable-power = <5000>;
2059+
trips {};
2060+
cooling-maps {};
2061+
};
2062+
2063+
tzts2: tzts2 {
2064+
polling-delay-passive = <0>;
2065+
polling-delay = <0>;
2066+
thermal-sensors = <&thermal 2>;
2067+
sustainable-power = <5000>;
2068+
trips {};
2069+
cooling-maps {};
2070+
};
2071+
2072+
tzts3: tzts3 {
2073+
polling-delay-passive = <0>;
2074+
polling-delay = <0>;
2075+
thermal-sensors = <&thermal 3>;
2076+
sustainable-power = <5000>;
2077+
trips {};
2078+
cooling-maps {};
2079+
};
2080+
2081+
tzts4: tzts4 {
2082+
polling-delay-passive = <0>;
2083+
polling-delay = <0>;
2084+
thermal-sensors = <&thermal 4>;
2085+
sustainable-power = <5000>;
2086+
trips {};
2087+
cooling-maps {};
2088+
};
2089+
2090+
tzts5: tzts5 {
2091+
polling-delay-passive = <0>;
2092+
polling-delay = <0>;
2093+
thermal-sensors = <&thermal 5>;
2094+
sustainable-power = <5000>;
2095+
trips {};
2096+
cooling-maps {};
2097+
};
2098+
2099+
tztsABB: tztsABB {
2100+
polling-delay-passive = <0>;
2101+
polling-delay = <0>;
2102+
thermal-sensors = <&thermal 6>;
2103+
sustainable-power = <5000>;
2104+
trips {};
2105+
cooling-maps {};
2106+
};
2107+
};
21082108
};

0 commit comments

Comments
 (0)