Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+29
-107
+1
-76
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
+1
-76
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0000.dts
···
1
1
// SPDX-License-Identifier: GPL-2.0
2
2
/dts-v1/;
3
3
4
-
#include <dt-bindings/input/linux-event-codes.h>
5
-
#include <dt-bindings/input/gpio-keys.h>
6
-
7
-
#include "tegra234-p3767.dtsi"
8
-
#include "tegra234-p3768-0000.dtsi"
4
+
#include "tegra234-p3768-0000+p3767.dtsi"
9
5
10
6
/ {
11
7
compatible = "nvidia,p3768-0000+p3767-0000", "nvidia,p3767-0000", "nvidia,tegra234";
···
25
29
status = "okay";
26
30
};
27
31
28
-
pwm@32a0000 {
29
-
assigned-clocks = <&bpmp TEGRA234_CLK_PWM3>;
30
-
assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>;
31
-
status = "okay";
32
-
};
33
-
34
32
hda@3510000 {
35
33
nvidia,model = "NVIDIA Jetson Orin NX HDA";
36
34
};
37
-
38
-
padctl@3520000 {
39
-
status = "okay";
40
-
};
41
-
};
42
-
43
-
gpio-keys {
44
-
compatible = "gpio-keys";
45
-
46
-
key-force-recovery {
47
-
label = "Force Recovery";
48
-
gpios = <&gpio TEGRA234_MAIN_GPIO(G, 0) GPIO_ACTIVE_LOW>;
49
-
linux,input-type = <EV_KEY>;
50
-
linux,code = <BTN_1>;
51
-
};
52
-
53
-
key-power {
54
-
label = "Power";
55
-
gpios = <&gpio_aon TEGRA234_AON_GPIO(EE, 4) GPIO_ACTIVE_LOW>;
56
-
linux,input-type = <EV_KEY>;
57
-
linux,code = <KEY_POWER>;
58
-
wakeup-event-action = <EV_ACT_ASSERTED>;
59
-
wakeup-source;
60
-
};
61
-
62
-
key-suspend {
63
-
label = "Suspend";
64
-
gpios = <&gpio TEGRA234_MAIN_GPIO(G, 2) GPIO_ACTIVE_LOW>;
65
-
linux,input-type = <EV_KEY>;
66
-
linux,code = <KEY_SLEEP>;
67
-
};
68
-
};
69
-
70
-
pwm-fan {
71
-
cooling-levels = <0 88 187 255>;
72
-
};
73
-
74
-
vdd_3v3_pcie: regulator-vdd-3v3-pcie {
75
-
compatible = "regulator-fixed";
76
-
regulator-name = "VDD_3V3_PCIE";
77
-
regulator-min-microvolt = <3300000>;
78
-
regulator-max-microvolt = <3300000>;
79
-
gpio = <&gpio_aon TEGRA234_AON_GPIO(AA, 5) GPIO_ACTIVE_HIGH>;
80
-
enable-active-high;
81
35
};
82
36
83
37
sound {
84
38
label = "NVIDIA Jetson Orin NX APE";
85
-
};
86
-
87
-
thermal-zones {
88
-
tj-thermal {
89
-
cooling-maps {
90
-
map-active-0 {
91
-
cooling-device = <&fan 0 1>;
92
-
trip = <&tj_trip_active0>;
93
-
};
94
-
95
-
map-active-1 {
96
-
cooling-device = <&fan 1 2>;
97
-
trip = <&tj_trip_active1>;
98
-
};
99
-
100
-
map-active-2 {
101
-
cooling-device = <&fan 2 3>;
102
-
trip = <&tj_trip_active2>;
103
-
};
104
-
};
105
-
};
106
39
};
107
40
};
+1
-30
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0005.dts
+1
-30
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767-0005.dts
···
1
1
// SPDX-License-Identifier: GPL-2.0
2
2
/dts-v1/;
3
3
4
-
#include <dt-bindings/input/linux-event-codes.h>
5
-
#include <dt-bindings/input/gpio-keys.h>
6
-
7
-
#include "tegra234-p3767.dtsi"
8
-
#include "tegra234-p3768-0000.dtsi"
4
+
#include "tegra234-p3768-0000+p3767.dtsi"
9
5
10
6
/ {
11
7
compatible = "nvidia,p3768-0000+p3767-0005", "nvidia,p3767-0005", "nvidia,tegra234";
···
13
17
};
14
18
};
15
19
16
-
pwm-fan {
17
-
cooling-levels = <0 88 187 255>;
18
-
};
19
-
20
20
sound {
21
21
label = "NVIDIA Jetson Orin Nano APE";
22
-
};
23
-
24
-
thermal-zones {
25
-
tj-thermal {
26
-
cooling-maps {
27
-
map-active-0 {
28
-
cooling-device = <&fan 0 1>;
29
-
trip = <&tj_trip_active0>;
30
-
};
31
-
32
-
map-active-1 {
33
-
cooling-device = <&fan 1 2>;
34
-
trip = <&tj_trip_active1>;
35
-
};
36
-
37
-
map-active-2 {
38
-
cooling-device = <&fan 2 3>;
39
-
trip = <&tj_trip_active2>;
40
-
};
41
-
};
42
-
};
43
22
};
44
23
};
+27
-1
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi
+27
-1
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi
arch/arm64/boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi
···
1
1
// SPDX-License-Identifier: GPL-2.0
2
2
3
+
#include <dt-bindings/input/linux-event-codes.h>
4
+
#include <dt-bindings/input/gpio-keys.h>
5
+
6
+
#include "tegra234-p3767.dtsi"
7
+
3
8
/ {
4
-
compatible = "nvidia,p3768-0000";
5
9
6
10
aliases {
7
11
serial0 = &tcu;
···
214
210
compatible = "pwm-fan";
215
211
pwms = <&pwm3 0 45334>;
216
212
#cooling-cells = <2>;
213
+
cooling-levels = <0 88 187 255>;
217
214
};
218
215
219
216
vdd_1v8_sys: regulator-vdd-1v8-sys {
···
245
240
246
241
serial {
247
242
status = "okay";
243
+
};
244
+
245
+
thermal-zones {
246
+
tj-thermal {
247
+
cooling-maps {
248
+
map-active-0 {
249
+
cooling-device = <&fan 0 1>;
250
+
trip = <&tj_trip_active0>;
251
+
};
252
+
253
+
map-active-1 {
254
+
cooling-device = <&fan 1 2>;
255
+
trip = <&tj_trip_active1>;
256
+
};
257
+
258
+
map-active-2 {
259
+
cooling-device = <&fan 2 3>;
260
+
trip = <&tj_trip_active2>;
261
+
};
262
+
};
263
+
};
248
264
};
249
265
};