Commit 79ed18d9 authored by Thierry Reding's avatar Thierry Reding
Browse files

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: default avatarThierry Reding <treding@nvidia.com>
parent 2838cfdd

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

+8 −8
Original line number Diff line number Diff line
@@ -1030,6 +1030,14 @@ 
	gpio-keys {

		compatible = "gpio-keys";



		key-power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			debounce-interval = <10>;

			wakeup-source;

		};



		switch-lid {

			label = "Lid";

			gpios = <&gpio TEGRA_GPIO(R, 4) GPIO_ACTIVE_LOW>;
@@ -1038,14 +1046,6 @@ 
			debounce-interval = <1>;

			wakeup-source;

		};



		key-power {

			label = "Power";

			gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			debounce-interval = <10>;

			wakeup-source;

		};

	};



	panel: panel {

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

+116 −116
Original line number Diff line number Diff line
@@ -893,122 +893,6 @@ 
		};

	};



	thermal-zones {

		cpu-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <0>;



			thermal-sensors =

				<&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;



			trips {

				cpu_shutdown_trip {

					temperature = <105000>;

					hysteresis = <1000>;

					type = "critical";

				};



				cpu_throttle_trip: throttle-trip {

					temperature = <102000>;

					hysteresis = <1000>;

					type = "hot";

				};

			};



			cooling-maps {

				map0 {

					trip = <&cpu_throttle_trip>;

					cooling-device = <&throttle_heavy 1 1>;

				};

			};

		};



		mem-thermal {

			polling-delay-passive = <0>;

			polling-delay = <0>;



			thermal-sensors =

				<&soctherm TEGRA124_SOCTHERM_SENSOR_MEM>;



			trips {

				mem_shutdown_trip {

					temperature = <101000>;

					hysteresis = <1000>;

					type = "critical";

				};

				mem_throttle_trip {

					temperature = <99000>;

					hysteresis = <1000>;

					type = "hot";

				};

			};



			cooling-maps {

				/*

				 * There are currently no cooling maps,

				 * because there are no cooling devices.

				 */

			};

		};



		gpu-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <0>;



			thermal-sensors =

				<&soctherm TEGRA124_SOCTHERM_SENSOR_GPU>;



			trips {

				gpu_shutdown_trip {

					temperature = <101000>;

					hysteresis = <1000>;

					type = "critical";

				};



				gpu_throttle_trip: throttle-trip {

					temperature = <99000>;

					hysteresis = <1000>;

					type = "hot";

				};

			};



			cooling-maps {

				map0 {

					trip = <&gpu_throttle_trip>;

					cooling-device = <&throttle_heavy 1 1>;

				};

			};

		};



		pllx-thermal {

			polling-delay-passive = <0>;

			polling-delay = <0>;



			thermal-sensors =

				<&soctherm TEGRA124_SOCTHERM_SENSOR_PLLX>;



			trips {

				pllx_shutdown_trip {

					temperature = <105000>;

					hysteresis = <1000>;

					type = "critical";

				};

				pllx_throttle_trip {

					temperature = <99000>;

					hysteresis = <1000>;

					type = "hot";

				};

			};



			cooling-maps {

				/*

				 * There are currently no cooling maps,

				 * because there are no cooling devices.

				 */

			};

		};

	};



	ahub@70300000 {

		compatible = "nvidia,tegra124-ahub";

		reg = <0x0 0x70300000 0x0 0x200>,
@@ -1255,6 +1139,122 @@ 
		};

	};



	thermal-zones {

		cpu-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <0>;



			thermal-sensors =

				<&soctherm TEGRA124_SOCTHERM_SENSOR_CPU>;



			trips {

				cpu_shutdown_trip {

					temperature = <105000>;

					hysteresis = <1000>;

					type = "critical";

				};



				cpu_throttle_trip: throttle-trip {

					temperature = <102000>;

					hysteresis = <1000>;

					type = "hot";

				};

			};



			cooling-maps {

				map0 {

					trip = <&cpu_throttle_trip>;

					cooling-device = <&throttle_heavy 1 1>;

				};

			};

		};



		mem-thermal {

			polling-delay-passive = <0>;

			polling-delay = <0>;



			thermal-sensors =

				<&soctherm TEGRA124_SOCTHERM_SENSOR_MEM>;



			trips {

				mem_shutdown_trip {

					temperature = <101000>;

					hysteresis = <1000>;

					type = "critical";

				};

				mem_throttle_trip {

					temperature = <99000>;

					hysteresis = <1000>;

					type = "hot";

				};

			};



			cooling-maps {

				/*

				 * There are currently no cooling maps,

				 * because there are no cooling devices.

				 */

			};

		};



		gpu-thermal {

			polling-delay-passive = <1000>;

			polling-delay = <0>;



			thermal-sensors =

				<&soctherm TEGRA124_SOCTHERM_SENSOR_GPU>;



			trips {

				gpu_shutdown_trip {

					temperature = <101000>;

					hysteresis = <1000>;

					type = "critical";

				};



				gpu_throttle_trip: throttle-trip {

					temperature = <99000>;

					hysteresis = <1000>;

					type = "hot";

				};

			};



			cooling-maps {

				map0 {

					trip = <&gpu_throttle_trip>;

					cooling-device = <&throttle_heavy 1 1>;

				};

			};

		};



		pllx-thermal {

			polling-delay-passive = <0>;

			polling-delay = <0>;



			thermal-sensors =

				<&soctherm TEGRA124_SOCTHERM_SENSOR_PLLX>;



			trips {

				pllx_shutdown_trip {

					temperature = <105000>;

					hysteresis = <1000>;

					type = "critical";

				};

				pllx_throttle_trip {

					temperature = <99000>;

					hysteresis = <1000>;

					type = "hot";

				};

			};



			cooling-maps {

				/*

				 * There are currently no cooling maps,

				 * because there are no cooling devices.

				 */

			};

		};

	};



	timer {

		compatible = "arm,armv7-timer";

		interrupts = <GIC_PPI 13

arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts

+1282 −1282

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi

+43 −43
Original line number Diff line number Diff line
@@ -190,32 +190,6 @@ 
		nvidia,invert-interrupt;

	};



	cpus {

		cpu@0 {

			enable-method = "psci";

		};



		cpu@1 {

			enable-method = "psci";

		};



		cpu@2 {

			enable-method = "psci";

		};



		cpu@3 {

			enable-method = "psci";

		};



		cpu@4 {

			enable-method = "psci";

		};



		cpu@5 {

			enable-method = "psci";

		};

	};



	bpmp {

		i2c {

			status = "okay";
@@ -235,6 +209,23 @@ 
				pinctrl-names = "default";

				pinctrl-0 = <&max77620_default>;



				fps {

					fps0 {

						maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>;

						maxim,shutdown-fps-time-period-us = <640>;

					};



					fps1 {

						maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN1>;

						maxim,shutdown-fps-time-period-us = <640>;

					};



					fps2 {

						maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>;

						maxim,shutdown-fps-time-period-us = <640>;

					};

				};



				max77620_default: pinmux {

					gpio0 {

						pins = "gpio0";
@@ -284,23 +275,6 @@ 
					};

				};



				fps {

					fps0 {

						maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>;

						maxim,shutdown-fps-time-period-us = <640>;

					};



					fps1 {

						maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN1>;

						maxim,shutdown-fps-time-period-us = <640>;

					};



					fps2 {

						maxim,fps-event-source = <MAX77620_FPS_EVENT_SRC_EN0>;

						maxim,shutdown-fps-time-period-us = <640>;

					};

				};



				regulators {

					in-sd0-supply = <&vdd_5v0_sys>;

					in-sd1-supply = <&vdd_5v0_sys>;
@@ -387,6 +361,32 @@ 
		};

	};



	cpus {

		cpu@0 {

			enable-method = "psci";

		};



		cpu@1 {

			enable-method = "psci";

		};



		cpu@2 {

			enable-method = "psci";

		};



		cpu@3 {

			enable-method = "psci";

		};



		cpu@4 {

			enable-method = "psci";

		};



		cpu@5 {

			enable-method = "psci";

		};

	};



	psci {

		compatible = "arm,psci-1.0";

		status = "okay";

arch/arm64/boot/dts/nvidia/tegra186-p3509-0000+p3636-0001.dts

+865 −865

File changed.

Preview size limit exceeded, changes collapsed.