Skip to contentSkip to conversation

Tegra234 AGX Orin DTS Updates

PATCH Applied Dara Stotland 3 participants 10 messages Aug 26, 2024 – Aug 29, 2024

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover Tegra234 AGX Orin DTS Updates

This patchset restructures the AGX Orin device tree for improved adaptability. It also fixes the placement of several nodes to be in the proper files.

Changes in v2:
- Added "arm64: tegra: Add common nodes to AGX Orin module"
- Removed "arm64: tegra: Create SKU8 AGX Orin board file"

Dara Stotland (7):
arm64: tegra: Add common nodes to AGX Orin module
arm64: tegra: Combine AGX Orin board files
arm64: tegra: Combine IGX Orin board files
arm64: tegra: Move AGX Orin nodes to correct location
arm64: tegra: Move padctl supply nodes to AGX Orin module
arm64: tegra: Move BPMP nodes to AGX Orin module
arm64: tegra: Add thermal nodes to AGX Orin SKU8

 .../boot/dts/nvidia/tegra234-p3701-0000.dtsi  | 135 ----------
 .../boot/dts/nvidia/tegra234-p3701-0008.dtsi  | 115 ++------
 .../arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 125 +++++++++
 .../nvidia/tegra234-p3737-0000+p3701-0000.dts | 108 +++++++-
 .../boot/dts/nvidia/tegra234-p3737-0000.dtsi  |  90 -------
 .../nvidia/tegra234-p3740-0002+p3701-0008.dts | 230 +++++++++++++++-
 .../boot/dts/nvidia/tegra234-p3740-0002.dtsi  | 248 ------------------
 7 files changed, 476 insertions(+), 575 deletions(-)
 delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi
 delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/7 arm64: tegra: Add common nodes to AGX Orin module

The AGX Orin module boards contain common nodes that can be moved to the included module dtsi. This eliminates redundancy within the files and reduces lines of code. Data from tegra234-p3701-0000 and tegra234-p3701-0008 that is common is now in tegra234-p3701.dtsi.

---
 .../boot/dts/nvidia/tegra234-p3701-0000.dtsi  | 83 -----------------
 .../boot/dts/nvidia/tegra234-p3701-0008.dtsi  | 89 -------------------
 .../arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 85 ++++++++++++++++++
 3 files changed, 85 insertions(+), 172 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi +0 -83
index cb792041fc62..ea846b879a21 100644
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 
-#include "tegra234.dtsi"
 #include "tegra234-p3701.dtsi"
 
 / {
@@ -8,34 +7,6 @@
 	compatible = "nvidia,p3701-0000", "nvidia,tegra234";
 
 	bus@0 {
-		i2c@3160000 {
-			status = "okay";
-
-			eeprom@50 {
-				compatible = "atmel,24c02";
-				reg = <0x50>;
-
-				label = "module";
-				vcc-supply = <&vdd_1v8_hs>;
-				address-width = <8>;
-				pagesize = <8>;
-				size = <256>;
-				read-only;
-			};
-		};
-
-		spi@3270000 {
-			status = "okay";
-
-			flash@0 {
-				compatible = "jedec,spi-nor";
-				reg = <0>;
-				spi-max-frequency = <102000000>;
-				spi-tx-bus-width = <4>;
-				spi-rx-bus-width = <4>;
-			};
-		};
-
 		mmc@3400000 {
 			status = "okay";
 			bus-width = <4>;
@@ -43,12 +14,6 @@
 			disable-wp;
 		};
 
-		mmc@3460000 {
-			status = "okay";
-			bus-width = <8>;
-			non-removable;
-		};
-
 		padctl@3520000 {
 			vclamp-usb-supply = <&vdd_1v8_ao>;
 			avdd-usb-supply = <&vdd_3v3_ao>;
@@ -72,54 +37,6 @@
 			};
 		};
 
-		rtc@c2a0000 {
-			status = "okay";
-		};
-
-		pmc@c360000 {
-			nvidia,invert-interrupt;
-		};
-	};
-
-	vdd_5v0_sys: regulator-vdd-5v0-sys {
-		compatible = "regulator-fixed";
-		regulator-name = "VIN_SYS_5V0";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		regulator-always-on;
-		regulator-boot-on;
-	};
-
-	vdd_1v8_ls: regulator-vdd-1v8-ls {
-		compatible = "regulator-fixed";
-		regulator-name = "VDD_1V8_LS";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-	};
-
-	vdd_1v8_hs: regulator-vdd-1v8-hs {
-		compatible = "regulator-fixed";
-		regulator-name = "VDD_1V8_HS";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-	};
-
-	vdd_1v8_ao: regulator-vdd-1v8-ao {
-		compatible = "regulator-fixed";
-		regulator-name = "VDD_1V8_AO";
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-		regulator-always-on;
-	};
-
-	vdd_3v3_ao: regulator-vdd-3v3-ao {
-		compatible = "regulator-fixed";
-		regulator-name = "VDD_3V3_AO";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		regulator-always-on;
 	};
 
 	vdd_3v3_pcie: regulator-vdd-3v3-pcie {
arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi +0 -89

103 lines not on this page · raw message

arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi +85 -0

101 lines not on this page · raw message

Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 2/7 arm64: tegra: Combine AGX Orin board files

In reply to Dara Stotland

The current AGX Orin structure has both a top-level module+board file as well as a board file. Most of the data in the board-file is closely related to the module itself. The benefit of this extra file is outweighed by the additional complexity. Merge the board file into the module+board file for simplicity.

---
 .../nvidia/tegra234-p3737-0000+p3701-0000.dts | 82 ++++++++++++++++-
 .../boot/dts/nvidia/tegra234-p3737-0000.dtsi  | 90 -------------------
 2 files changed, 80 insertions(+), 92 deletions(-)
 delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +80 -2
index 69db584253da..21feaf434439 100644
@@ -3,9 +3,9 @@
 
 #include <dt-bindings/input/linux-event-codes.h>
 #include <dt-bindings/input/gpio-keys.h>
+#include <dt-bindings/sound/rt5640.h>
 
 #include "tegra234-p3701-0000.dtsi"
-#include "tegra234-p3737-0000.dtsi"
 
 / {
 	model = "NVIDIA Jetson AGX Orin Developer Kit";
@@ -22,23 +22,90 @@
 	};
 
 	bus@0 {
+		aconnect@2900000 {
+			ahub@2900800 {
+				i2s@2901000 {
+					ports {
+						port@1 {
+							endpoint {
+								dai-format = "i2s";
+								remote-endpoint = <&rt5640_ep>;
+							};
+						};
+					};
+				};
+			};
+		};
+
 		serial@3100000 {
 			compatible = "nvidia,tegra194-hsuart";
 			reset-names = "serial";
 			status = "okay";
 		};
 
+		i2c@3160000 {
+			status = "okay";
+
+			eeprom@56 {
+				compatible = "atmel,24c02";
+				reg = <0x56>;
+
+				label = "system";
+				vcc-supply = <&vdd_1v8_sys>;
+				address-width = <8>;
+				pagesize = <8>;
+				size = <256>;
+				read-only;
+			};
+		};
+
 		serial@31d0000 {
 			current-speed = <115200>;
 			status = "okay";
 		};
 
+		i2c@31e0000 {
+			status = "okay";
+
+			audio-codec@1c {
+				compatible = "realtek,rt5640";
+				reg = <0x1c>;
+				interrupt-parent = <&gpio>;
+				interrupts = <TEGRA234_MAIN_GPIO(AC, 5) GPIO_ACTIVE_HIGH>;
+				clocks = <&bpmp TEGRA234_CLK_AUD_MCLK>;
+				clock-names = "mclk";
+				realtek,dmic1-data-pin = <RT5640_DMIC1_DATA_PIN_NONE>;
+				realtek,dmic2-data-pin = <RT5640_DMIC2_DATA_PIN_NONE>;
+				realtek,jack-detect-source = <RT5640_JD_SRC_HDA_HEADER>;
+				sound-name-prefix = "CVB-RT";
+
+				port {
+					rt5640_ep: endpoint {
+						remote-endpoint = <&i2s1_dap>;
+						mclk-fs = <256>;
+					};
+				};
+			};
+		};
+
+		pwm@3280000 {
+			status = "okay";
+		};
+
 		pwm@32a0000 {
 			assigned-clocks = <&bpmp TEGRA234_CLK_PWM3>;
 			assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>;
 			status = "okay";
 		};
 
+		pwm@32c0000 {
+			status = "okay";
+		};
+
+		pwm@32f0000 {
+			status = "okay";
+		};
+
 		hda@3510000 {
 			nvidia,model = "NVIDIA Jetson AGX Orin HDA";
 			status = "okay";
@@ -341,8 +408,11 @@
 		};
 	};
 
-	pwm-fan {
+	fan: pwm-fan {
+		compatible = "pwm-fan";
 		cooling-levels = <66 215 255>;
+		pwms = <&pwm3 0 45334>;
+		#cooling-cells = <2>;
 	};
 
 	serial {
@@ -444,4 +514,12 @@
 			};
 		};
 	};
+
+	vdd_1v8_sys: regulator-vdd-1v8-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "VDD_1V8_SYS";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-always-on;
+	};
 };
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi deleted +0 -90

90 lines not on this page · raw message

Signature · 1 line
2.17.1
#3 lore raw

PATCH v2 3/7 arm64: tegra: Combine IGX Orin board files

In reply to Dara Stotland

Current IGX Orin structure has both a top-level module+board file as well as a board file. Most of the data in the board-file is closely related to the module itself. The benefit of this extra file is outweighed by the additional complexity. Merge the board file into the module+board file for simplicity.

---
 .../nvidia/tegra234-p3740-0002+p3701-0008.dts | 236 ++++++++++++++++-
 .../boot/dts/nvidia/tegra234-p3740-0002.dtsi  | 248 ------------------
 2 files changed, 235 insertions(+), 249 deletions(-)
 delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi
arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts +235 -1
index bac611d735c5..9581b31b459f 100644
@@ -3,8 +3,8 @@
 
 #include <dt-bindings/input/linux-event-codes.h>
 #include <dt-bindings/input/gpio-keys.h>
+#include <dt-bindings/sound/rt5640.h>
 #include "tegra234-p3701-0008.dtsi"
-#include "tegra234-p3740-0002.dtsi"
 
 / {
 	model = "NVIDIA IGX Orin Development Kit";
@@ -20,6 +20,32 @@
 	};
 
 	bus@0 {
+		aconnect@2900000 {
+			ahub@2900800 {
+				i2s@2901300 {
+					ports {
+						port@1 {
+							endpoint {
+								dai-format = "i2s";
+								remote-endpoint = <&rt5640_ep>;
+							};
+						};
+					};
+				};
+
+				i2s@2901500 {
+					ports {
+						port@1 {
+							endpoint {
+								bitclock-master;
+								frame-master;
+							};
+						};
+					};
+				};
+			};
+		};
+
 		serial@3100000 {
 			compatible = "nvidia,tegra194-hsuart";
 			reset-names = "serial";
@@ -45,6 +71,40 @@
 		i2c@31c0000 {
 			status = "okay";
 
+			rt5640: audio-codec@1c {
+				compatible = "realtek,rt5640";
+				reg = <0x1c>;
+				interrupt-parent = <&gpio>;
+				interrupts = <TEGRA234_MAIN_GPIO(F, 3) GPIO_ACTIVE_HIGH>;
+				clocks = <&bpmp TEGRA234_CLK_AUD_MCLK>;
+				clock-names = "mclk";
+
+				realtek,dmic1-data-pin = <RT5640_DMIC1_DATA_PIN_NONE>;
+				realtek,dmic2-data-pin = <RT5640_DMIC2_DATA_PIN_NONE>;
+				realtek,jack-detect-source = <RT5640_JD_SRC_HDA_HEADER>;
+
+				sound-name-prefix = "CVB-RT";
+
+				port {
+					rt5640_ep: endpoint {
+						remote-endpoint = <&i2s4_dap>;
+						mclk-fs = <256>;
+					};
+				};
+			};
+
+			/* carrier board ID EEPROM */
+			eeprom@55 {
+				compatible = "atmel,24c02";
+				reg = <0x55>;
+
+				label = "system";
+				vcc-supply = <&vdd_1v8_ls>;
+				address-width = <8>;
+				pagesize = <8>;
+				size = <256>;
+				read-only;
+			};
 		};
 
 		i2c@31e0000 {
@@ -60,6 +120,121 @@
 			status = "okay";
 		};
 
+		padctl@3520000 {
+			vclamp-usb-supply = <&vdd_1v8_ao>;
+			avdd-usb-supply = <&vdd_3v3_ao>;
+			status = "okay";
+
+			pads {
+				usb2 {
+					lanes {
+						usb2-0 {
+							nvidia,function = "xusb";
+							status = "okay";
+						};
+
+						usb2-1 {
+							nvidia,function = "xusb";
+							status = "okay";
+						};
+
+						usb2-2 {
+							nvidia,function = "xusb";
+							status = "okay";
+						};
+
+						usb2-3 {
+							nvidia,function = "xusb";
+							status = "okay";
+						};
+					};
+				};
+
+				usb3 {
+					lanes {
+						usb3-0 {
+							nvidia,function = "xusb";
+							status = "okay";
+						};
+
+						usb3-1 {
+							nvidia,function = "xusb";
+							status = "okay";
+						};
+
+						usb3-2 {
+							nvidia,function = "xusb";
+							status = "okay";
+						};
+					};
+				};
+			};
+
+			ports {
+				usb2-0 {
+					mode = "otg";
+					usb-role-switch;
+					status = "okay";
+					vbus-supply = <&vdd_5v0_sys>;
+				};
+
+				usb2-1 {
+					mode = "host";
+					status = "okay";
+					vbus-supply = <&vdd_5v0_sys>;
+				};
+
+				usb2-2 {
+					mode = "host";
+					status = "okay";
+					vbus-supply = <&vdd_5v0_sys>;
+				};
+
+				usb2-3 {
+					mode = "host";
+					status = "okay";
+					vbus-supply = <&vdd_5v0_sys>;
+				};
+
+				usb3-0 {
+					nvidia,usb2-companion = <2>;
+					status = "okay";
+				};
+
+				usb3-1 {
+					nvidia,usb2-companion = <0>;
+					status = "okay";
+				};
+
+				usb3-2 {
+					nvidia,usb2-companion = <1>;
+					status = "okay";
+				};
+			};
+		};
+
+		usb@3550000 {
+			status = "okay";
+
+			phys = <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-0}>,
+				<&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-1}>;
+			phy-names = "usb2-0", "usb3-0";
+		};
+
+		usb@3610000 {
+			status = "okay";
+
+			phys =	<&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-0}>,
+				<&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-1}>,
+				<&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-2}>,
+				<&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-3}>,
+				<&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-0}>,
+				<&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-1}>,
+				<&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-2}>;
+			phy-names = "usb2-0", "usb2-1", "usb2-2", "usb2-3",
+				"usb3-0", "usb3-1", "usb3-2";
+		};
+
 		fuse@3810000 {
 			status = "okay";
 		};
@@ -70,6 +245,37 @@
 
 		i2c@c250000 {
 			status = "okay";
+
+			power-sensor@41 {
+				compatible = "ti,ina3221";
+				reg = <0x41>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				input@0 {
+					reg = <0x0>;
+					label = "CVB_ATX_12V";
+					shunt-resistor-micro-ohms = <2000>;
+				};
+
+				input@1 {
+					reg = <0x1>;
+					label = "CVB_ATX_3V3";
+					shunt-resistor-micro-ohms = <2000>;
+				};
+
+				input@2 {
+					reg = <0x2>;
+					label = "CVB_ATX_5V";
+					shunt-resistor-micro-ohms = <2000>;
+				};
+			};
+
+			power-sensor@44 {
+				compatible = "ti,ina219";
+				reg = <0x44>;
+				shunt-resistor = <2000>;
+			};
 		};
 
 		host1x@13e00000 {
@@ -235,4 +441,32 @@
 			  "CVB-RT DMIC1",		"CVB-RT MIC",
 			  "CVB-RT DMIC2",		"CVB-RT MIC";
 	};
+
+	vdd_3v3_dp: regulator-vdd-3v3-dp {
+		compatible = "regulator-fixed";
+		regulator-name = "VDD_3V3_DP";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		vin-supply = <&vdd_3v3_sys>;
+		gpio = <&gpio TEGRA234_MAIN_GPIO(H, 6) 0>;
+		enable-active-high;
+		regulator-always-on;
+	};
+
+	vdd_3v3_sys: regulator-vdd-3v3-sys {
+		compatible = "regulator-fixed";
+		regulator-name = "VDD_3V3_SYS";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
+
+	vdd_3v3_wifi: regulator-vdd-3v3-wifi {
+		compatible = "regulator-fixed";
+		regulator-name = "VDD_3V3_WIFI";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		gpio = <&gpio TEGRA234_MAIN_GPIO(G, 3) GPIO_ACTIVE_HIGH>;
+		regulator-boot-on;
+		enable-active-high;
+	};
 };
arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi deleted +0 -248

248 lines not on this page · raw message

Signature · 1 line
2.17.1
#4 lore raw

PATCH v2 4/7 arm64: tegra: Move AGX Orin nodes to correct location

In reply to Dara Stotland

Some of the nodes inside the AGX Orin module file are in the wrong location. In particular, the SD card interface and two of the PCIe regulators in the module file should instead reside in the board file. These components are not part of the module. They are part of the carrier board. Move these nodes to the correct location.

Fixes cd42b26a527f ("arm64: tegra: Add regulators required for PCIe")
Fixes d71b893a119d ("arm64: tegra: Add Tegra234 SDMMC1 device tree node")
---
 .../boot/dts/nvidia/tegra234-p3701-0000.dtsi  | 25 ------------------
 .../nvidia/tegra234-p3737-0000+p3701-0000.dts | 26 +++++++++++++++++++
 2 files changed, 26 insertions(+), 25 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi +0 -25
index ea846b879a21..2830eab1b2eb 100644
@@ -7,12 +7,6 @@
 	compatible = "nvidia,p3701-0000", "nvidia,tegra234";
 
 	bus@0 {
-		mmc@3400000 {
-			status = "okay";
-			bus-width = <4>;
-			cd-gpios = <&gpio TEGRA234_MAIN_GPIO(G, 7) GPIO_ACTIVE_LOW>;
-			disable-wp;
-		};
 
 		padctl@3520000 {
 			vclamp-usb-supply = <&vdd_1v8_ao>;
@@ -39,25 +33,6 @@
 
 	};
 
-	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 TEGRA234_MAIN_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
-		regulator-boot-on;
-		enable-active-high;
-	};
-
-	vdd_12v_pcie: regulator-vdd-12v-pcie {
-		compatible = "regulator-fixed";
-		regulator-name = "VDD_12V_PCIE";
-		regulator-min-microvolt = <12000000>;
-		regulator-max-microvolt = <12000000>;
-		gpio = <&gpio TEGRA234_MAIN_GPIO(A, 1) GPIO_ACTIVE_LOW>;
-		regulator-boot-on;
-	};
-
 	thermal-zones {
 		tj-thermal {
 			polling-delay = <1000>;
arch/arm64/boot/dts/nvidia/tegra234-p3737-0000+p3701-0000.dts +26 -0
index 21feaf434439..90f12277aede 100644
@@ -106,6 +106,13 @@
 			status = "okay";
 		};
 
+		mmc@3400000 {
+			status = "okay";
+			bus-width = <4>;
+			cd-gpios = <&gpio TEGRA234_MAIN_GPIO(G, 7) GPIO_ACTIVE_LOW>;
+			disable-wp;
+		};
+
 		hda@3510000 {
 			nvidia,model = "NVIDIA Jetson AGX Orin HDA";
 			status = "okay";
@@ -522,4 +529,23 @@
 		regulator-max-microvolt = <1800000>;
 		regulator-always-on;
 	};
+
+	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 TEGRA234_MAIN_GPIO(H, 4) GPIO_ACTIVE_HIGH>;
+		regulator-boot-on;
+		enable-active-high;
+	};
+
+	vdd_12v_pcie: regulator-vdd-12v-pcie {
+		compatible = "regulator-fixed";
+		regulator-name = "VDD_12V_PCIE";
+		regulator-min-microvolt = <12000000>;
+		regulator-max-microvolt = <12000000>;
+		gpio = <&gpio TEGRA234_MAIN_GPIO(A, 1) GPIO_ACTIVE_LOW>;
+		regulator-boot-on;
+	};
 };
Signature · 1 line
2.17.1
#5 lore raw

PATCH v2 5/7 arm64: tegra: Move padctl supply nodes to AGX Orin module

In reply to Dara Stotland

Some padctl supply nodes currently reside in board file, when they should reside on module level. The nodes are part of module, not board. Move these nodes to the correct AGX Orin module file.

---
 .../boot/dts/nvidia/tegra234-p3701-0000.dtsi  | 27 -------------------
 .../arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 23 ++++++++++++++++
 .../nvidia/tegra234-p3740-0002+p3701-0008.dts |  6 -----
 3 files changed, 23 insertions(+), 33 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi +0 -27
index 2830eab1b2eb..d977f4901c09 100644
@@ -6,33 +6,6 @@
 	model = "NVIDIA Jetson AGX Orin";
 	compatible = "nvidia,p3701-0000", "nvidia,tegra234";
 
-	bus@0 {
-
-		padctl@3520000 {
-			vclamp-usb-supply = <&vdd_1v8_ao>;
-			avdd-usb-supply = <&vdd_3v3_ao>;
-
-			ports {
-				usb2-0 {
-					vbus-supply = <&vdd_5v0_sys>;
-				};
-
-				usb2-1 {
-					vbus-supply = <&vdd_5v0_sys>;
-				};
-
-				usb2-2 {
-					vbus-supply = <&vdd_5v0_sys>;
-				};
-
-				usb2-3 {
-					vbus-supply = <&vdd_5v0_sys>;
-				};
-			};
-		};
-
-	};
-
 	thermal-zones {
 		tj-thermal {
 			polling-delay = <1000>;
arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi +23 -0
index 18bd4ccb6b77..0471cea31b73 100644
@@ -81,6 +81,29 @@
 			non-removable;
 		};
 
+		padctl@3520000 {
+			vclamp-usb-supply = <&vdd_1v8_ao>;
+			avdd-usb-supply = <&vdd_3v3_ao>;
+
+			ports {
+				usb2-0 {
+					vbus-supply = <&vdd_5v0_sys>;
+				};
+
+				usb2-1 {
+					vbus-supply = <&vdd_5v0_sys>;
+				};
+
+				usb2-2 {
+					vbus-supply = <&vdd_5v0_sys>;
+				};
+
+				usb2-3 {
+					vbus-supply = <&vdd_5v0_sys>;
+				};
+			};
+		};
+
 		i2c@c240000 {
 			status = "okay";
 
arch/arm64/boot/dts/nvidia/tegra234-p3740-0002+p3701-0008.dts +0 -6
index 9581b31b459f..36e888053746 100644
@@ -121,8 +121,6 @@
 		};
 
 		padctl@3520000 {
-			vclamp-usb-supply = <&vdd_1v8_ao>;
-			avdd-usb-supply = <&vdd_3v3_ao>;
 			status = "okay";
 
 			pads {
@@ -175,25 +173,21 @@
 					mode = "otg";
 					usb-role-switch;
 					status = "okay";
-					vbus-supply = <&vdd_5v0_sys>;
 				};
 
 				usb2-1 {
 					mode = "host";
 					status = "okay";
-					vbus-supply = <&vdd_5v0_sys>;
 				};
 
 				usb2-2 {
 					mode = "host";
 					status = "okay";
-					vbus-supply = <&vdd_5v0_sys>;
 				};
 
 				usb2-3 {
 					mode = "host";
 					status = "okay";
-					vbus-supply = <&vdd_5v0_sys>;
 				};
 
 				usb3-0 {
Signature · 1 line
2.17.1
#6 lore raw

PATCH v2 6/7 arm64: tegra: Move BPMP nodes to AGX Orin module

In reply to Dara Stotland

All SKUs of the p3701 module contain a temp sensor connected to the BPMP I2C. Move the associated nodes from tegra234-p3701-0008.dtsi to tegra234-p3701.dtsi. Add missing compatible.

---
 .../boot/dts/nvidia/tegra234-p3701-0008.dtsi    | 16 ----------------
 arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi  | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 16 deletions(-)
arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi +0 -16
index 9218ea8d43e6..f0fa6a76149e 100644
@@ -4,20 +4,4 @@
 
 / {
 	compatible = "nvidia,p3701-0008", "nvidia,tegra234";
-
-	bpmp {
-		i2c {
-			status = "okay";
-
-			thermal-sensor@4c {
-				status = "okay";
-				reg = <0x4c>;
-				vcc-supply = <&vdd_1v8_ao>;
-			};
-		};
-
-		thermal {
-			status = "okay";
-		};
-	};
 };
arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi +17 -0
index 0471cea31b73..9086a0d010e5 100644
@@ -166,6 +166,23 @@
 		};
 	};
 
+	bpmp {
+		i2c {
+			status = "okay";
+
+			thermal-sensor@4c {
+				compatible = "ti,tmp451";
+				status = "okay";
+				reg = <0x4c>;
+				vcc-supply = <&vdd_1v8_ao>;
+			};
+		};
+
+		thermal {
+			status = "okay";
+		};
+	};
+
 	vdd_1v8_ao: regulator-vdd-1v8-ao {
 		compatible = "regulator-fixed";
 		regulator-name = "VDD_1V8_AO";
Signature · 1 line
2.17.1
#7 lore raw

PATCH v2 7/7 arm64: tegra: Add thermal nodes to AGX Orin SKU8

In reply to Dara Stotland

One of the key differences between p3701-0000 and p3701-0008 is the temperature range. Add this info for p3701-0008.

---
 .../boot/dts/nvidia/tegra234-p3701-0008.dtsi  | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
arch/arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi +22 -0
index f0fa6a76149e..0809634e5732 100644
@@ -4,4 +4,26 @@
 
 / {
 	compatible = "nvidia,p3701-0008", "nvidia,tegra234";
+
+	thermal-zones {
+		tj-thermal {
+			polling-delay = <1000>;
+			polling-delay-passive = <1000>;
+			status = "okay";
+
+			trips {
+				tj_trip_active0: active-0 {
+					temperature = <85000>;
+					hysteresis = <4000>;
+					type = "active";
+				};
+
+				tj_trip_active1: active-1 {
+					temperature = <105000>;
+					hysteresis = <4000>;
+					type = "active";
+				};
+			};
+		};
+	};
 };
Signature · 1 line
2.17.1
Reviewed-by on the v2 series
#8 lore raw
In reply to Dara Stotland
Quoted 4 lines · Dara Stotland

Changes in v2:
- Added "arm64: tegra: Add common nodes to AGX Orin module"
- Removed "arm64: tegra: Create SKU8 AGX Orin board file"

Quoted 8 lines

Dara Stotland (7):
arm64: tegra: Add common nodes to AGX Orin module
arm64: tegra: Combine AGX Orin board files
arm64: tegra: Combine IGX Orin board files
arm64: tegra: Move AGX Orin nodes to correct location
arm64: tegra: Move padctl supply nodes to AGX Orin module
arm64: tegra: Move BPMP nodes to AGX Orin module
arm64: tegra: Add thermal nodes to AGX Orin SKU8

#9 lore raw
In reply to Dara Stotland
Quoted 17 lines · Dara Stotland

This patchset restructures the AGX Orin device tree for improved adaptability. It also fixes the placement of several nodes to be in the proper files.

Changes in v2:
- Added "arm64: tegra: Add common nodes to AGX Orin module"
- Removed "arm64: tegra: Create SKU8 AGX Orin board file"

Dara Stotland (7):
arm64: tegra: Add common nodes to AGX Orin module
arm64: tegra: Combine AGX Orin board files
arm64: tegra: Combine IGX Orin board files
arm64: tegra: Move AGX Orin nodes to correct location
arm64: tegra: Move padctl supply nodes to AGX Orin module
arm64: tegra: Move BPMP nodes to AGX Orin module
arm64: tegra: Add thermal nodes to AGX Orin SKU8

Quoted 10 lines
 .../boot/dts/nvidia/tegra234-p3701-0000.dtsi  | 135 ----------
 .../boot/dts/nvidia/tegra234-p3701-0008.dtsi  | 115 ++------
 .../arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 125 +++++++++
 .../nvidia/tegra234-p3737-0000+p3701-0000.dts | 108 +++++++-
 .../boot/dts/nvidia/tegra234-p3737-0000.dtsi  |  90 -------
 .../nvidia/tegra234-p3740-0002+p3701-0008.dts | 230 +++++++++++++++-
 .../boot/dts/nvidia/tegra234-p3740-0002.dtsi  | 248 ------------------
 7 files changed, 476 insertions(+), 575 deletions(-)
 delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi
 delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi

Applied, thanks.

Thierry