From 6fb6a1dc2f7df5416c757d85cc7c0260317a8505 Mon Sep 17 00:00:00 2001 From: Vedant Deshpande Date: Thu, 27 Jun 2024 21:53:16 +0000 Subject: [PATCH] arm64: tegra: Restructure Orin NX/Nano device tree The Orin NX and Orin Nano boards share a common carrier board and the module boards for both platforms are very similar. Therefore, restructure the Orin NX/Nano device-tree source files to adhere to a simple hierarchical format. This will help make clear where changes should go, and eliminates redundancy within the files. Previously the carrier board file was independent. However, given that it is so tightly coupled with the module design, it will be more practical to combine files together for a simpler layout. Following changes are made to restructure the device tree source files: 1) Change include hierarchy. Top-level dts includes board dtsi. Board dtsi includes module dtsi. Module dtsi includes SoC dtsi. 2) Data from the top level dts file that is common to both Orin NX and Orin Nano is in tegra234-p3768-0000+p3767.dtsi. 3) Only data that is unique to NX/Nano is present in the top-level dts. Signed-off-by: Vedant Deshpande Signed-off-by: Thierry Reding Bug 4707773 Change-Id: I45d73a33db0c654b7d98fdfa456c52f7b024a26a Signed-off-by: Brad Griffis Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3207075 (cherry picked from commit c1afccabc1bd19b6229a1c0df2d292ab0748e146) Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3216024 GVS: buildbot_gerritrpt Reviewed-by: Jon Hunter --- tegra234-p3768-0000+p3767-0000.dts | 77 +------------------ tegra234-p3768-0000+p3767-0005.dts | 31 +------- ...000.dtsi => tegra234-p3768-0000+p3767.dtsi | 28 ++++++- 3 files changed, 29 insertions(+), 107 deletions(-) rename tegra234-p3768-0000.dtsi => tegra234-p3768-0000+p3767.dtsi (90%) diff --git a/tegra234-p3768-0000+p3767-0000.dts b/tegra234-p3768-0000+p3767-0000.dts index 1607ee1..82a59e3 100644 --- a/tegra234-p3768-0000+p3767-0000.dts +++ b/tegra234-p3768-0000+p3767-0000.dts @@ -1,11 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; -#include -#include - -#include "tegra234-p3767.dtsi" -#include "tegra234-p3768-0000.dtsi" +#include "tegra234-p3768-0000+p3767.dtsi" / { compatible = "nvidia,p3768-0000+p3767-0000", "nvidia,p3767-0000", "nvidia,tegra234"; @@ -29,83 +25,12 @@ status = "okay"; }; - pwm@32a0000 { - assigned-clocks = <&bpmp TEGRA234_CLK_PWM3>; - assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>; - status = "okay"; - }; - hda@3510000 { nvidia,model = "NVIDIA Jetson Orin NX HDA"; }; - - padctl@3520000 { - status = "okay"; - }; - }; - - gpio-keys { - compatible = "gpio-keys"; - - key-force-recovery { - label = "Force Recovery"; - gpios = <&gpio TEGRA234_MAIN_GPIO(G, 0) GPIO_ACTIVE_LOW>; - linux,input-type = ; - linux,code = ; - }; - - key-power { - label = "Power"; - gpios = <&gpio_aon TEGRA234_AON_GPIO(EE, 4) GPIO_ACTIVE_LOW>; - linux,input-type = ; - linux,code = ; - wakeup-event-action = ; - wakeup-source; - }; - - key-suspend { - label = "Suspend"; - gpios = <&gpio TEGRA234_MAIN_GPIO(G, 2) GPIO_ACTIVE_LOW>; - linux,input-type = ; - linux,code = ; - }; - }; - - pwm-fan { - cooling-levels = <0 88 187 255>; - }; - - vdd_3v3_pcie: regulator-vdd-3v3-pcie { - compatible = "regulator-fixed"; - regulator-name = "VDD_3V3_PCIE"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - gpio = <&gpio_aon TEGRA234_AON_GPIO(AA, 5) GPIO_ACTIVE_HIGH>; - enable-active-high; }; sound { label = "NVIDIA Jetson Orin NX APE"; }; - - thermal-zones { - tj-thermal { - cooling-maps { - map-active-0 { - cooling-device = <&fan 0 1>; - trip = <&tj_trip_active0>; - }; - - map-active-1 { - cooling-device = <&fan 1 2>; - trip = <&tj_trip_active1>; - }; - - map-active-2 { - cooling-device = <&fan 2 3>; - trip = <&tj_trip_active2>; - }; - }; - }; - }; }; diff --git a/tegra234-p3768-0000+p3767-0005.dts b/tegra234-p3768-0000+p3767-0005.dts index dc2d4be..9f5e070 100644 --- a/tegra234-p3768-0000+p3767-0005.dts +++ b/tegra234-p3768-0000+p3767-0005.dts @@ -1,11 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /dts-v1/; -#include -#include - -#include "tegra234-p3767.dtsi" -#include "tegra234-p3768-0000.dtsi" +#include "tegra234-p3768-0000+p3767.dtsi" / { compatible = "nvidia,p3768-0000+p3767-0005", "nvidia,p3767-0005", "nvidia,tegra234"; @@ -17,32 +13,7 @@ }; }; - pwm-fan { - cooling-levels = <0 88 187 255>; - }; - sound { label = "NVIDIA Jetson Orin Nano APE"; }; - - thermal-zones { - tj-thermal { - cooling-maps { - map-active-0 { - cooling-device = <&fan 0 1>; - trip = <&tj_trip_active0>; - }; - - map-active-1 { - cooling-device = <&fan 1 2>; - trip = <&tj_trip_active1>; - }; - - map-active-2 { - cooling-device = <&fan 2 3>; - trip = <&tj_trip_active2>; - }; - }; - }; - }; }; diff --git a/tegra234-p3768-0000.dtsi b/tegra234-p3768-0000+p3767.dtsi similarity index 90% rename from tegra234-p3768-0000.dtsi rename to tegra234-p3768-0000+p3767.dtsi index 5d0298b..6d64a24 100644 --- a/tegra234-p3768-0000.dtsi +++ b/tegra234-p3768-0000+p3767.dtsi @@ -1,7 +1,11 @@ // SPDX-License-Identifier: GPL-2.0 +#include +#include + +#include "tegra234-p3767.dtsi" + / { - compatible = "nvidia,p3768-0000"; aliases { serial0 = &tcu; @@ -210,6 +214,7 @@ compatible = "pwm-fan"; pwms = <&pwm3 0 45334>; #cooling-cells = <2>; + cooling-levels = <0 88 187 255>; }; vdd_1v8_sys: regulator-vdd-1v8-sys { @@ -241,4 +246,25 @@ serial { status = "okay"; }; + + thermal-zones { + tj-thermal { + cooling-maps { + map-active-0 { + cooling-device = <&fan 0 1>; + trip = <&tj_trip_active0>; + }; + + map-active-1 { + cooling-device = <&fan 1 2>; + trip = <&tj_trip_active1>; + }; + + map-active-2 { + cooling-device = <&fan 2 3>; + trip = <&tj_trip_active2>; + }; + }; + }; + }; };