mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-18 22:14:16 +00:00
arm64: tegra: Device tree changes for v6.9-rc1
This set of changes refactors the audio-related device tree nodes on Tegra234 and improves USB support for Jetson AGX Xavier. Furthermore this consolidates SD/MMC aliases on Tegra234 and provides correct configuration data for the MGBE Ethernet devices found on Tegra234 so that they can operate at full speed. -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmXY11QACgkQ3SOs138+ s6Hg5hAAjnK4X5fDwmDD882HBZCA87ikXSVxFzXFmjT/9Wu6I28YuNrL3LWCRAaJ btX0xAJzTnZGhxGUig1nC+i56oxBZt71u8t/ap0pXKQK/An3LFDoNCgd+08SWMb1 aeCW5/VfZfuNpCTG8DRCPEqBPpgoiCNUSGbdKa0Xy9o2clY0GHvhFNmym5H0k+1A vHbJij/ByRDE1ffjfC6x+iCRS0BO1wlxmwSQKj6t/5TFKsYOuG/XsqCQ7C4yW67I MzyzQoQ1dWFGZUPm6DvXRz8Nl0gPxjy/1aI3cJRd7Q0U65TrC8IwVbQhfv8Eqc0W iUEXAvriEbKtZk3ocbdeZBy27hlCNCSJTba8l19hOh7qg0wC1+pyXIUDkX9UJ1xU svgh9eiw4v3wGtW+tz06X+dKn9FUcTwA8fiXzGjya2nJhOi2o1w/ciJZN6S1lahn vRYTyImxyE+nBkPmZuv2oSypxEHYz09vmcGZIYUN96EqfyMEyev/aIQG2KyJtC9c onpseos2vFUzp8TIn76z3MLDEJHLoebKrlxp0ZoFLGq25nHkcplASjvXoQ6wuzVu nclpwQQuJx0vWznno0YZbl1sQmiCNZTE1Zg9UyVGwQHesIwdIEvoZYQ1rsKnGHUx XpCpR/caZx8S4BrN56/1UzqJu10gJrlKfNZxpLrMHaMzoxqx6PM= =98Yi -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmXgtVAACgkQYKtH/8kJ UieIHBAAhPXau6VOLbw6rbo/kNP9Eu6g4kvMH0d2wklqfUX1crpEyNFtI6a+fLfw ITSQDTzICyQjGLWp+wW3mq8zSa++2lCke1xsSj6c77RFqvg09KLdjVPufnfY57ft 8703q+GXHTd5QvHj332edrRq6HkrXo/Mh9P1f3bJr7SiXkdmccbi7aWffOAeM2Be TKi+FFzW5n7hAWdzBuFUyszvWnx4c/fx69arWAH0EYL1hyQ94lTBWX8CELQF5bW5 9F05u0CVJ8ePsuw8duKngZnoa53k5lPNkemfdcjNN1WKZc8Eupt00ioHpctb7afE 1ux2PLYOHTjqV01a1xnjrD4eZ7Oq8etw4tCb3GORu0tL+NCxgHiiyh5Sg/GY/CTm F/yl7/AunFgp5/ahegSk6RFswLbM2cEfaPSBexZiFPzonGXXaJb9V4zgSuNth6BN NzsexuVRohw4wZa1o9dfrnVsIguCHQIpVrBY7K6GDpTLlzynXD6hSyvZbg7r2O2l tmaU19e2eek7fteNEEmHKpvq38dyQaL7azRxxqAVZOsHvAaB3DJQxZrqXyNPem85 eTSjVAdh5E1TXLJypD8ONn9U6daWvviYXPcOpdu9x22PqGS07fC8z/j1RLe0bAKw oo7qQwxTcqu/tqGIzs6APQky1UDS/nRJzFY5fGQS8X0ZsnFVG7c= =QB8Y -----END PGP SIGNATURE----- Merge tag 'tegra-for-6.9-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt arm64: tegra: Device tree changes for v6.9-rc1 This set of changes refactors the audio-related device tree nodes on Tegra234 and improves USB support for Jetson AGX Xavier. Furthermore this consolidates SD/MMC aliases on Tegra234 and provides correct configuration data for the MGBE Ethernet devices found on Tegra234 so that they can operate at full speed. * tag 'tegra-for-6.9-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: tegra: Remove Jetson Orin NX and Jetson Orin Nano DTSI arm64: tegra: Add audio support for Jetson Orin NX and Jetson Orin Nano arm64: tegra: Define missing IO ports arm64: tegra: Move AHUB ports to SoC DTSI arm64: tegra: Add USB Type-C controller for Jetson AGX Xavier arm64: tegra: Add USB device support for Jetson AGX Xavier arm64: tegra: Add current monitors for Jetson Xavier arm64: tegra: Add AXI configuration for Tegra234 MGBE arm64: tegra: Use consistent SD/MMC aliases on Tegra234 arm64: tegra: Enable cros-ec-spi as wake source Link: https://lore.kernel.org/r/20240223174849.1509465-5-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
commit
b1208c4343
13 changed files with 2355 additions and 2000 deletions
|
|
@ -762,6 +762,7 @@
|
|||
interrupt-parent = <&gpio>;
|
||||
interrupts = <TEGRA_GPIO(C, 7) IRQ_TYPE_LEVEL_LOW>;
|
||||
reg = <0>;
|
||||
wakeup-source;
|
||||
|
||||
google,cros-ec-spi-msg-delay = <2000>;
|
||||
|
||||
|
|
|
|||
|
|
@ -53,6 +53,56 @@
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
i2c@c240000 {
|
||||
status = "okay";
|
||||
|
||||
power-sensor@40 {
|
||||
compatible = "ti,ina3221";
|
||||
reg = <0x40>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
input@0 {
|
||||
reg = <0x0>;
|
||||
label = "GPU";
|
||||
shunt-resistor-micro-ohms = <5000>;
|
||||
};
|
||||
input@1 {
|
||||
reg = <0x1>;
|
||||
label = "CPU";
|
||||
shunt-resistor-micro-ohms = <5000>;
|
||||
};
|
||||
input@2 {
|
||||
reg = <0x2>;
|
||||
label = "SOC";
|
||||
shunt-resistor-micro-ohms = <5000>;
|
||||
};
|
||||
};
|
||||
|
||||
power-sensor@41 {
|
||||
compatible = "ti,ina3221";
|
||||
reg = <0x41>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
input@0 {
|
||||
reg = <0x0>;
|
||||
label = "CV";
|
||||
shunt-resistor-micro-ohms = <5000>;
|
||||
};
|
||||
input@1 {
|
||||
reg = <0x1>;
|
||||
label = "VDDRQ";
|
||||
shunt-resistor-micro-ohms = <5000>;
|
||||
};
|
||||
input@2 {
|
||||
reg = <0x2>;
|
||||
label = "SYS5V";
|
||||
shunt-resistor-micro-ohms = <5000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
serial@3110000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2062,8 +2062,15 @@
|
|||
|
||||
ports {
|
||||
usb2-0 {
|
||||
mode = "host";
|
||||
mode = "otg";
|
||||
usb-role-switch;
|
||||
status = "okay";
|
||||
|
||||
port {
|
||||
hs_typec_p0: endpoint {
|
||||
remote-endpoint = <&hs_ucsi_ccg_p0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
usb2-1 {
|
||||
|
|
@ -2094,6 +2101,14 @@
|
|||
};
|
||||
};
|
||||
|
||||
usb@3550000 {
|
||||
status = "okay";
|
||||
|
||||
phys = <&{/bus@0/padctl@3520000/pads/usb2/lanes/usb2-0}>,
|
||||
<&{/bus@0/padctl@3520000/pads/usb3/lanes/usb3-2}>;
|
||||
phy-names = "usb2-0", "usb3-0";
|
||||
};
|
||||
|
||||
usb@3610000 {
|
||||
status = "okay";
|
||||
|
||||
|
|
@ -2106,6 +2121,40 @@
|
|||
phy-names = "usb2-0", "usb2-1", "usb2-3", "usb3-0", "usb3-2", "usb3-3";
|
||||
};
|
||||
|
||||
i2c@c240000 {
|
||||
typec@8 {
|
||||
compatible = "cypress,cypd4226";
|
||||
reg = <0x08>;
|
||||
interrupt-parent = <&gpio_aon>;
|
||||
interrupts = <TEGRA194_AON_GPIO(BB, 2) IRQ_TYPE_LEVEL_LOW>;
|
||||
firmware-name = "nvidia,jetson-agx-xavier";
|
||||
status = "okay";
|
||||
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
ccg_typec_con0: connector@0 {
|
||||
compatible = "usb-c-connector";
|
||||
reg = <0>;
|
||||
label = "USB-C";
|
||||
data-role = "dual";
|
||||
|
||||
ports {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
port@0 {
|
||||
reg = <0>;
|
||||
|
||||
hs_ucsi_ccg_p0: endpoint {
|
||||
remote-endpoint = <&hs_typec_p0>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
i2c@c250000 {
|
||||
status = "okay";
|
||||
|
||||
|
|
|
|||
|
|
@ -50,6 +50,33 @@
|
|||
status = "okay";
|
||||
};
|
||||
|
||||
i2c@c250000 {
|
||||
status = "okay";
|
||||
|
||||
power-sensor@40 {
|
||||
compatible = "ti,ina3221";
|
||||
reg = <0x40>;
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
input@0 {
|
||||
reg = <0x0>;
|
||||
label = "VDD_IN";
|
||||
shunt-resistor-micro-ohms = <5000>;
|
||||
};
|
||||
input@1 {
|
||||
reg = <0x1>;
|
||||
label = "VDD_CPU_GPU_CV";
|
||||
shunt-resistor-micro-ohms = <5000>;
|
||||
};
|
||||
input@2 {
|
||||
reg = <0x2>;
|
||||
label = "VDD_SOC";
|
||||
shunt-resistor-micro-ohms = <5000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
serial@3100000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -12,7 +12,6 @@
|
|||
compatible = "nvidia,p3737-0000+p3701-0000", "nvidia,p3701-0000", "nvidia,tegra234";
|
||||
|
||||
aliases {
|
||||
mmc3 = "/bus@0/mmc@3460000";
|
||||
serial0 = &tcu;
|
||||
serial1 = &uarta;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
#include "tegra234-p3767.dtsi"
|
||||
|
||||
/ {
|
||||
compatible = "nvidia,p3767-0000", "nvidia,tegra234";
|
||||
model = "NVIDIA Jetson Orin NX";
|
||||
|
||||
bus@0 {
|
||||
hda@3510000 {
|
||||
nvidia,model = "NVIDIA Jetson Orin NX HDA";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
// SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
#include "tegra234-p3767.dtsi"
|
||||
|
||||
/ {
|
||||
compatible = "nvidia,p3767-0005", "nvidia,tegra234";
|
||||
model = "NVIDIA Jetson Orin Nano";
|
||||
|
||||
bus@0 {
|
||||
hda@3510000 {
|
||||
nvidia,model = "NVIDIA Jetson Orin Nano HDA";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -5,7 +5,35 @@
|
|||
/ {
|
||||
compatible = "nvidia,p3767", "nvidia,tegra234";
|
||||
|
||||
aliases {
|
||||
mmc0 = "/bus@0/mmc@3400000";
|
||||
};
|
||||
|
||||
bus@0 {
|
||||
aconnect@2900000 {
|
||||
status = "okay";
|
||||
|
||||
ahub@2900800 {
|
||||
status = "okay";
|
||||
|
||||
i2s@2901100 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
i2s@2901300 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
||||
dma-controller@2930000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
interrupt-controller@2a40000 {
|
||||
status = "okay";
|
||||
};
|
||||
};
|
||||
|
||||
i2c@3160000 {
|
||||
status = "okay";
|
||||
|
||||
|
|
@ -127,6 +155,64 @@
|
|||
vin-supply = <&vdd_5v0_sys>;
|
||||
};
|
||||
|
||||
sound {
|
||||
compatible = "nvidia,tegra186-audio-graph-card";
|
||||
status = "okay";
|
||||
|
||||
dais = /* ADMAIF (FE) Ports */
|
||||
<&admaif0_port>, <&admaif1_port>, <&admaif2_port>, <&admaif3_port>,
|
||||
<&admaif4_port>, <&admaif5_port>, <&admaif6_port>, <&admaif7_port>,
|
||||
<&admaif8_port>, <&admaif9_port>, <&admaif10_port>, <&admaif11_port>,
|
||||
<&admaif12_port>, <&admaif13_port>, <&admaif14_port>, <&admaif15_port>,
|
||||
<&admaif16_port>, <&admaif17_port>, <&admaif18_port>, <&admaif19_port>,
|
||||
/* XBAR Ports */
|
||||
<&xbar_i2s2_port>, <&xbar_i2s4_port>,
|
||||
<&xbar_sfc1_in_port>, <&xbar_sfc2_in_port>,
|
||||
<&xbar_sfc3_in_port>, <&xbar_sfc4_in_port>,
|
||||
<&xbar_mvc1_in_port>, <&xbar_mvc2_in_port>,
|
||||
<&xbar_amx1_in1_port>, <&xbar_amx1_in2_port>,
|
||||
<&xbar_amx1_in3_port>, <&xbar_amx1_in4_port>,
|
||||
<&xbar_amx2_in1_port>, <&xbar_amx2_in2_port>,
|
||||
<&xbar_amx2_in3_port>, <&xbar_amx2_in4_port>,
|
||||
<&xbar_amx3_in1_port>, <&xbar_amx3_in2_port>,
|
||||
<&xbar_amx3_in3_port>, <&xbar_amx3_in4_port>,
|
||||
<&xbar_amx4_in1_port>, <&xbar_amx4_in2_port>,
|
||||
<&xbar_amx4_in3_port>, <&xbar_amx4_in4_port>,
|
||||
<&xbar_adx1_in_port>, <&xbar_adx2_in_port>,
|
||||
<&xbar_adx3_in_port>, <&xbar_adx4_in_port>,
|
||||
<&xbar_mix_in1_port>, <&xbar_mix_in2_port>,
|
||||
<&xbar_mix_in3_port>, <&xbar_mix_in4_port>,
|
||||
<&xbar_mix_in5_port>, <&xbar_mix_in6_port>,
|
||||
<&xbar_mix_in7_port>, <&xbar_mix_in8_port>,
|
||||
<&xbar_mix_in9_port>, <&xbar_mix_in10_port>,
|
||||
<&xbar_asrc_in1_port>, <&xbar_asrc_in2_port>,
|
||||
<&xbar_asrc_in3_port>, <&xbar_asrc_in4_port>,
|
||||
<&xbar_asrc_in5_port>, <&xbar_asrc_in6_port>,
|
||||
<&xbar_asrc_in7_port>,
|
||||
<&xbar_ope1_in_port>,
|
||||
/* HW accelerators */
|
||||
<&sfc1_out_port>, <&sfc2_out_port>,
|
||||
<&sfc3_out_port>, <&sfc4_out_port>,
|
||||
<&mvc1_out_port>, <&mvc2_out_port>,
|
||||
<&amx1_out_port>, <&amx2_out_port>,
|
||||
<&amx3_out_port>, <&amx4_out_port>,
|
||||
<&adx1_out1_port>, <&adx1_out2_port>,
|
||||
<&adx1_out3_port>, <&adx1_out4_port>,
|
||||
<&adx2_out1_port>, <&adx2_out2_port>,
|
||||
<&adx2_out3_port>, <&adx2_out4_port>,
|
||||
<&adx3_out1_port>, <&adx3_out2_port>,
|
||||
<&adx3_out3_port>, <&adx3_out4_port>,
|
||||
<&adx4_out1_port>, <&adx4_out2_port>,
|
||||
<&adx4_out3_port>, <&adx4_out4_port>,
|
||||
<&mix_out1_port>, <&mix_out2_port>, <&mix_out3_port>,
|
||||
<&mix_out4_port>, <&mix_out5_port>,
|
||||
<&asrc_out1_port>, <&asrc_out2_port>, <&asrc_out3_port>,
|
||||
<&asrc_out4_port>, <&asrc_out5_port>, <&asrc_out6_port>,
|
||||
<&ope1_out_port>,
|
||||
/* BE I/O Ports */
|
||||
<&i2s2_port>, <&i2s4_port>;
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
tj-thermal {
|
||||
polling-delay = <1000>;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include <dt-bindings/input/linux-event-codes.h>
|
||||
#include <dt-bindings/input/gpio-keys.h>
|
||||
|
||||
#include "tegra234-p3767-0000.dtsi"
|
||||
#include "tegra234-p3767.dtsi"
|
||||
#include "tegra234-p3768-0000.dtsi"
|
||||
|
||||
/ {
|
||||
|
|
@ -37,7 +37,6 @@
|
|||
|
||||
hda@3510000 {
|
||||
nvidia,model = "NVIDIA Jetson Orin NX HDA";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
padctl@3520000 {
|
||||
|
|
@ -85,6 +84,10 @@
|
|||
enable-active-high;
|
||||
};
|
||||
|
||||
sound {
|
||||
label = "NVIDIA Jetson Orin NX APE";
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
tj-thermal {
|
||||
cooling-maps {
|
||||
|
|
|
|||
|
|
@ -4,17 +4,27 @@
|
|||
#include <dt-bindings/input/linux-event-codes.h>
|
||||
#include <dt-bindings/input/gpio-keys.h>
|
||||
|
||||
#include "tegra234-p3767-0005.dtsi"
|
||||
#include "tegra234-p3767.dtsi"
|
||||
#include "tegra234-p3768-0000.dtsi"
|
||||
|
||||
/ {
|
||||
compatible = "nvidia,p3768-0000+p3767-0005", "nvidia,p3767-0005", "nvidia,tegra234";
|
||||
model = "NVIDIA Jetson Orin Nano Developer Kit";
|
||||
|
||||
bus@0 {
|
||||
hda@3510000 {
|
||||
nvidia,model = "NVIDIA Jetson Orin Nano HDA";
|
||||
};
|
||||
};
|
||||
|
||||
pwm-fan {
|
||||
cooling-levels = <0 88 187 255>;
|
||||
};
|
||||
|
||||
sound {
|
||||
label = "NVIDIA Jetson Orin Nano APE";
|
||||
};
|
||||
|
||||
thermal-zones {
|
||||
tj-thermal {
|
||||
cooling-maps {
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
compatible = "nvidia,tegra234-vdk", "nvidia,tegra234";
|
||||
|
||||
aliases {
|
||||
mmc3 = "/bus@0/mmc@3460000";
|
||||
serial0 = &uarta;
|
||||
};
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Reference in a new issue