Skip to content

Commit 79ed18d

Browse files
committed
arm64: tegra: Sort nodes by unit-address, then alphabetically
Nodes in device tree should be sorted by unit-address, followed by nodes without a unit-address, sorted alphabetically. Some exceptions are the top-level aliases, chosen, firmware, memory and reserved-memory nodes, which are expected to come first. These rules apply recursively with some exceptions, such as pinmux nodes or regulator nodes, which often follow more complicated ordering (often by "importance"). While at it, change the name of some of the nodes to follow standard naming conventions, which helps with the sorting order and reduces the amount of warnings from the DT validation tools. Signed-off-by: Thierry Reding <treding@nvidia.com>
1 parent 2838cfd commit 79ed18d

22 files changed

Lines changed: 7297 additions & 7291 deletions

arch/arm64/boot/dts/nvidia/tegra132-norrin.dts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1030,6 +1030,14 @@
10301030
gpio-keys {
10311031
compatible = "gpio-keys";
10321032

1033+
key-power {
1034+
label = "Power";
1035+
gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
1036+
linux,code = <KEY_POWER>;
1037+
debounce-interval = <10>;
1038+
wakeup-source;
1039+
};
1040+
10331041
switch-lid {
10341042
label = "Lid";
10351043
gpios = <&gpio TEGRA_GPIO(R, 4) GPIO_ACTIVE_LOW>;
@@ -1038,14 +1046,6 @@
10381046
debounce-interval = <1>;
10391047
wakeup-source;
10401048
};
1041-
1042-
key-power {
1043-
label = "Power";
1044-
gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
1045-
linux,code = <KEY_POWER>;
1046-
debounce-interval = <10>;
1047-
wakeup-source;
1048-
};
10491049
};
10501050

10511051
panel: panel {

arch/arm64/boot/dts/nvidia/tegra132.dtsi

Lines changed: 116 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -893,122 +893,6 @@
893893
};
894894
};
895895

896-
thermal-zones {
897-
cpu-thermal {
898-
polling-delay-passive = <1000>;
899-
polling-delay = <0>;
900-
901-
thermal-sensors =
902-
<&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;
903-
904-
trips {
905-
cpu_shutdown_trip {
906-
temperature = <105000>;
907-
hysteresis = <1000>;
908-
type = "critical";
909-
};
910-
911-
cpu_throttle_trip: throttle-trip {
912-
temperature = <102000>;
913-
hysteresis = <1000>;
914-
type = "hot";
915-
};
916-
};
917-
918-
cooling-maps {
919-
map0 {
920-
trip = <&cpu_throttle_trip>;
921-
cooling-device = <&throttle_heavy 1 1>;
922-
};
923-
};
924-
};
925-
926-
mem-thermal {
927-
polling-delay-passive = <0>;
928-
polling-delay = <0>;
929-
930-
thermal-sensors =
931-
<&soctherm TEGRA124_SOCTHERM_SENSOR_MEM>;
932-
933-
trips {
934-
mem_shutdown_trip {
935-
temperature = <101000>;
936-
hysteresis = <1000>;
937-
type = "critical";
938-
};
939-
mem_throttle_trip {
940-
temperature = <99000>;
941-
hysteresis = <1000>;
942-
type = "hot";
943-
};
944-
};
945-
946-
cooling-maps {
947-
/*
948-
* There are currently no cooling maps,
949-
* because there are no cooling devices.
950-
*/
951-
};
952-
};
953-
954-
gpu-thermal {
955-
polling-delay-passive = <1000>;
956-
polling-delay = <0>;
957-
958-
thermal-sensors =
959-
<&soctherm TEGRA124_SOCTHERM_SENSOR_GPU>;
960-
961-
trips {
962-
gpu_shutdown_trip {
963-
temperature = <101000>;
964-
hysteresis = <1000>;
965-
type = "critical";
966-
};
967-
968-
gpu_throttle_trip: throttle-trip {
969-
temperature = <99000>;
970-
hysteresis = <1000>;
971-
type = "hot";
972-
};
973-
};
974-
975-
cooling-maps {
976-
map0 {
977-
trip = <&gpu_throttle_trip>;
978-
cooling-device = <&throttle_heavy 1 1>;
979-
};
980-
};
981-
};
982-
983-
pllx-thermal {
984-
polling-delay-passive = <0>;
985-
polling-delay = <0>;
986-
987-
thermal-sensors =
988-
<&soctherm TEGRA124_SOCTHERM_SENSOR_PLLX>;
989-
990-
trips {
991-
pllx_shutdown_trip {
992-
temperature = <105000>;
993-
hysteresis = <1000>;
994-
type = "critical";
995-
};
996-
pllx_throttle_trip {
997-
temperature = <99000>;
998-
hysteresis = <1000>;
999-
type = "hot";
1000-
};
1001-
};
1002-
1003-
cooling-maps {
1004-
/*
1005-
* There are currently no cooling maps,
1006-
* because there are no cooling devices.
1007-
*/
1008-
};
1009-
};
1010-
};
1011-
1012896
ahub@70300000 {
1013897
compatible = "nvidia,tegra124-ahub";
1014898
reg = <0x0 0x70300000 0x0 0x200>,
@@ -1255,6 +1139,122 @@
12551139
};
12561140
};
12571141

1142+
thermal-zones {
1143+
cpu-thermal {
1144+
polling-delay-passive = <1000>;
1145+
polling-delay = <0>;
1146+
1147+
thermal-sensors =
1148+
<&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;
1149+
1150+
trips {
1151+
cpu_shutdown_trip {
1152+
temperature = <105000>;
1153+
hysteresis = <1000>;
1154+
type = "critical";
1155+
};
1156+
1157+
cpu_throttle_trip: throttle-trip {
1158+
temperature = <102000>;
1159+
hysteresis = <1000>;
1160+
type = "hot";
1161+
};
1162+
};
1163+
1164+
cooling-maps {
1165+
map0 {
1166+
trip = <&cpu_throttle_trip>;
1167+
cooling-device = <&throttle_heavy 1 1>;
1168+
};
1169+
};
1170+
};
1171+
1172+
mem-thermal {
1173+
polling-delay-passive = <0>;
1174+
polling-delay = <0>;
1175+
1176+
thermal-sensors =
1177+
<&soctherm TEGRA124_SOCTHERM_SENSOR_MEM>;
1178+
1179+
trips {
1180+
mem_shutdown_trip {
1181+
temperature = <101000>;
1182+
hysteresis = <1000>;
1183+
type = "critical";
1184+
};
1185+
mem_throttle_trip {
1186+
temperature = <99000>;
1187+
hysteresis = <1000>;
1188+
type = "hot";
1189+
};
1190+
};
1191+
1192+
cooling-maps {
1193+
/*
1194+
* There are currently no cooling maps,
1195+
* because there are no cooling devices.
1196+
*/
1197+
};
1198+
};
1199+
1200+
gpu-thermal {
1201+
polling-delay-passive = <1000>;
1202+
polling-delay = <0>;
1203+
1204+
thermal-sensors =
1205+
<&soctherm TEGRA124_SOCTHERM_SENSOR_GPU>;
1206+
1207+
trips {
1208+
gpu_shutdown_trip {
1209+
temperature = <101000>;
1210+
hysteresis = <1000>;
1211+
type = "critical";
1212+
};
1213+
1214+
gpu_throttle_trip: throttle-trip {
1215+
temperature = <99000>;
1216+
hysteresis = <1000>;
1217+
type = "hot";
1218+
};
1219+
};
1220+
1221+
cooling-maps {
1222+
map0 {
1223+
trip = <&gpu_throttle_trip>;
1224+
cooling-device = <&throttle_heavy 1 1>;
1225+
};
1226+
};
1227+
};
1228+
1229+
pllx-thermal {
1230+
polling-delay-passive = <0>;
1231+
polling-delay = <0>;
1232+
1233+
thermal-sensors =
1234+
<&soctherm TEGRA124_SOCTHERM_SENSOR_PLLX>;
1235+
1236+
trips {
1237+
pllx_shutdown_trip {
1238+
temperature = <105000>;
1239+
hysteresis = <1000>;
1240+
type = "critical";
1241+
};
1242+
pllx_throttle_trip {
1243+
temperature = <99000>;
1244+
hysteresis = <1000>;
1245+
type = "hot";
1246+
};
1247+
};
1248+
1249+
cooling-maps {
1250+
/*
1251+
* There are currently no cooling maps,
1252+
* because there are no cooling devices.
1253+
*/
1254+
};
1255+
};
1256+
};
1257+
12581258
timer {
12591259
compatible = "arm,armv7-timer";
12601260
interrupts = <GIC_PPI 13

0 commit comments

Comments
 (0)