Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-25 13:41:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

arm64: tegra: Device tree changes for v6.11-rc1

Browse Source 
This contains one patch that reworks the device tree structure for
 Jetson Orin NX and Jetson Orin Nano, which are both within the same
 family. This restructuring makes it easier to extend both platforms
 in a consistent way in the future.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAmZ+3YsACgkQ3SOs138+
 s6E6qg//eJu9trfH6Tgqvga/YDV98jLHXl6mbjk1zpYOE6K51gM2E9ypaU2Xaefz
 uwZwKe4rDs9GPeKzm2lyd9hHvYUSgzQ5JYfkw8a9G3Ne8E+fbZZ//ElGrUAAbKbd
 C6uN/uXg5udsiTKuXMf/PSAzyvUbUJOY4DC7CA4ilu0GO3pmtafpcaBPvUAWGqDR
 IWVJGFjlYNPWB+ROmyhTYCtpDQX/4Ok5JgjLyOiSzYq/qBZ3AA1OaZW9u10nbcH+
 cBeCBjt/0Pd1bqSxgPwdSxztR6EdmA34zAhi77rJ5shjfR/lqEntwZabg7SezTXK
 ZiduASpTr95kHWdJ6+v25Dj0JzXG8b/9KV6WDMhBY6SBQDiJoWwsGaRcMjbAolHN
 0t58Y/h8mlSREbQc1Yrd9Gk6g/Z9tSfa0TJ3bY4I+squw01Xtl3zB0kw8dBPKMU6
 d5YoTci5QCpih9r7fQ+6YCOA2/QcSxpFURa0Hlm7MjGPRpkmaOt8ZhrfdkFs97mG
 H9I1KZ4URX7YwVahvO6G+bRSJLvJNqO3IwZIk/vbCOZQCyXz2RX7vHKN9J734ZBA
 ThtdTvYCDBo0B70h/SAQYza3o40+WXHaDiEUbDa+3ExGOL0vg6hIzoLB5Gyc56CY
 xKlaDeJUX2XcPoZ11feLbvYu0ylCThmsP/DR7t+qgfkqYfMM8Dw=
 =+CSv
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmaL9gIACgkQYKtH/8kJ
 UicCFBAA5AQQaTZ7ru6bZnGMPMphO26fYTWokqLuRtky3Js6+MD8z6E9CE+KAqMe
 uETX2ANP3yjIWRKO0ktRndckdA5IzOcyOP9Dp2VuQyuc6OCk7RU2gOvepazYgIu1
 JTP/cjka+UwG6asCSQx8+5Ly00RZOTGoVfjfgu48gB3mE3tWPLN0L5C5MzqT4RgY
 AQ4PWogpyj3GDq82eZtd3cXs+oTuz20x240pwZME9fP7Kja0dyp2Jm5ZrkrIcO+B
 vV73MZM8eK2nePnpMC+2pUvvB9xH1/MJsaeJT6uz6RN6plex4MabobeZMrjhnPIG
 43AaLMM7FMyfjW8hD0b8tQKyda3kXqsYsg/SlVqrA0d92XU//zTWLd7+EeJmEqsf
 TxjmEKkgwK5tDnwuptnfnZLfvwXPRPqs5X6E+dXTUpTXFsXTTpXDvu3Tjn+B0prC
 nk4PQBdHKPGxc2PY1L1uscPpGVjMSGjHAaXqIeup6BOuXoptorUCSzl6jKOiNlIc
 787kqtlIgE/s0cdUjW2ma1oVhMJZcgAoxJi9UJoQ0ZzwBaBRaMhWYP+J19yGPx4D
 joLmFFLH3M2sNQC+sFpL+aWtx+1/EShAJ6W3Bqt6yZ3DXyjyi35+Z2vlq31NMIT2
 gDwWLFK+fa/t0mPzmtlmtO0nlUaISxZjr9jTs1Szwkro+Ik/SNo=
 =CUSX
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-6.11-arm64-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt

arm64: tegra: Device tree changes for v6.11-rc1

This contains one patch that reworks the device tree structure for
Jetson Orin NX and Jetson Orin Nano, which are both within the same
family. This restructuring makes it easier to extend both platforms
in a consistent way in the future.

* tag 'tegra-for-6.11-arm64-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Restructure Orin NX/Nano device tree

Link: https://lore.kernel.org/r/20240628210818.3627404-3-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2024-07-08 16:21:53 +02:00
commit cdb3f6ba4b
3 changed files with 29 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
View File

@ -1,11 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/input/gpio-keys.h>
#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 = <EV_KEY>;
linux,code = <BTN_1>;
};
key-power {
label = "Power";
gpios = <&gpio_aon TEGRA234_AON_GPIO(EE, 4) GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
linux,code = <KEY_POWER>;
wakeup-event-action = <EV_ACT_ASSERTED>;
wakeup-source;
};
key-suspend {
label = "Suspend";
gpios = <&gpio TEGRA234_MAIN_GPIO(G, 2) GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
linux,code = <KEY_SLEEP>;
};
};
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>;
};
};
};
};
};

31
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0005.dts
View File

@ -1,11 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
/dts-v1/;
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/input/gpio-keys.h>
#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>;
};
};
};
};
};

28
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi → arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi
View File

@ -1,7 +1,11 @@
// SPDX-License-Identifier: GPL-2.0
#include <dt-bindings/input/linux-event-codes.h>
#include <dt-bindings/input/gpio-keys.h>
#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>;
};
};
};
};
};