Skip to content

Commit 3d46ce7

Browse files
arndbarndb
committed
Merge tag 'tegra-for-6.20-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt
arm64: tegra: Changes for v6.20-rc1 This update improves Device Tree support for 64-bit Tegra platforms, specifically focusing on the Smaug board and the Tegra264 SoC. It enables full USB-C functionality on Smaug by adding role-switching support and enabling DisplayPort altmode. For Tegra264, it introduces nodes for Command Queue Virtualization (CMDQV) in the SMMU, adds the Data Backbone (DBB) clock for the memory controller, and corrects CPU compatible strings to match the Neoverse V3AE core. Additionally, it performs a cleanup by removing redundant status = "okay" properties across Tegra186, Tegra194, Tegra234, and Tegra264 files. * tag 'tegra-for-6.20-arm64-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: tegra: smaug: Add usb-role-switch support arm64: tegra: smaug: Complete and enable tegra-udc node arm64: tegra: smaug: Enable DisplayPort via USB-C port arm64: tegra: Correct CPU compatibles on Tegra264 arm64: tegra: Drop unneeded status=okay on Tegra264 arm64: tegra: Drop unneeded status=okay on Tegra234 arm64: tegra: Drop unneeded status=okay on Tegra194 arm64: tegra: Drop unneeded status=okay on Tegra186 arm64: tegra: Add nodes for CMDQV arm64: tegra: Add DBB clock to EMC on Tegra264 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 50411c8 + dfa9378 commit 3d46ce7

6 files changed

Lines changed: 83 additions & 46 deletions

File tree

‎arch/arm64/boot/dts/nvidia/tegra186.dtsi‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@
120120
iommus = <&smmu TEGRA186_SID_GPCDMA_0>;
121121
dma-coherent;
122122
dma-channel-mask = <0xfffffffe>;
123-
status = "okay";
124123
};
125124

126125
aconnect@2900000 {
@@ -608,7 +607,6 @@
608607
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
609608
<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
610609
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
611-
status = "okay";
612610
};
613611

614612
uarta: serial@3100000 {

‎arch/arm64/boot/dts/nvidia/tegra194.dtsi‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797
<GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>;
9898
nvidia,axi2apb = <&axi2apb>;
9999
nvidia,apbmisc = <&apbmisc>;
100-
status = "okay";
101100
};
102101

103102
axi2apb: axi2apb@2390000 {
@@ -108,13 +107,11 @@
108107
<0x0 0x23c0000 0x0 0x1000>,
109108
<0x0 0x23d0000 0x0 0x1000>,
110109
<0x0 0x23e0000 0x0 0x1000>;
111-
status = "okay";
112110
};
113111

114112
pinmux: pinmux@2430000 {
115113
compatible = "nvidia,tegra194-pinmux";
116114
reg = <0x0 0x2430000 0x0 0x17000>;
117-
status = "okay";
118115

119116
pex_clkreq_c5_bi_dir_state: pinmux-pex-clkreq-c5-bi-dir {
120117
clkreq {
@@ -208,7 +205,6 @@
208205
iommus = <&smmu TEGRA194_SID_GPCDMA_0>;
209206
dma-coherent;
210207
dma-channel-mask = <0xfffffffe>;
211-
status = "okay";
212208
};
213209

214210
aconnect@2900000 {
@@ -737,7 +733,6 @@
737733
<GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>,
738734
<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>,
739735
<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
740-
status = "okay";
741736
};
742737

743738
uarta: serial@3100000 {
@@ -1359,7 +1354,6 @@
13591354
nvidia,int-threshold = <1>;
13601355
nvidia,slices = <11>;
13611356
#timestamp-cells = <1>;
1362-
status = "okay";
13631357
};
13641358

13651359
hsp_top0: hsp@3c00000 {
@@ -1547,7 +1541,6 @@
15471541
<GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
15481542
nvidia,axi2apb = <&axi2apb>;
15491543
nvidia,apbmisc = <&apbmisc>;
1550-
status = "okay";
15511544
};
15521545

15531546
rce-noc@be00000 {
@@ -1557,7 +1550,6 @@
15571550
<GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
15581551
nvidia,axi2apb = <&axi2apb>;
15591552
nvidia,apbmisc = <&apbmisc>;
1560-
status = "okay";
15611553
};
15621554

15631555
hsp_aon: hsp@c150000 {
@@ -1582,7 +1574,6 @@
15821574
nvidia,int-threshold = <1>;
15831575
nvidia,slices = <3>;
15841576
#timestamp-cells = <1>;
1585-
status = "okay";
15861577
};
15871578

15881579
gen2_i2c: i2c@c240000 {
@@ -1668,8 +1659,6 @@
16681659
pinmux_aon: pinmux@c300000 {
16691660
compatible = "nvidia,tegra194-pinmux-aon";
16701661
reg = <0x0 0xc300000 0x0 0x4000>;
1671-
1672-
status = "okay";
16731662
};
16741663

16751664
pwm4: pwm@c340000 {
@@ -1722,7 +1711,6 @@
17221711
interrupts = <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
17231712
<GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
17241713
nvidia,apbmisc = <&apbmisc>;
1725-
status = "okay";
17261714
};
17271715

17281716
bpmp-noc@d600000 {
@@ -1732,7 +1720,6 @@
17321720
<GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
17331721
nvidia,axi2apb = <&axi2apb>;
17341722
nvidia,apbmisc = <&apbmisc>;
1735-
status = "okay";
17361723
};
17371724

17381725
iommu@10000000 {
@@ -1886,7 +1873,6 @@
18861873
#iommu-cells = <1>;
18871874

18881875
nvidia,memory-controller = <&mc>;
1889-
status = "okay";
18901876
};
18911877

18921878
host1x@13e00000 {
@@ -3106,7 +3092,6 @@
31063092

31073093
psci {
31083094
compatible = "arm,psci-1.0";
3109-
status = "okay";
31103095
method = "smc";
31113096
};
31123097

‎arch/arm64/boot/dts/nvidia/tegra210-smaug.dts‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
};
3232

3333
host1x@50000000 {
34+
dpaux1: dpaux@54040000 {
35+
vdd-supply = <&pp3300>;
36+
status = "okay";
37+
};
38+
3439
dsia: dsi@54300000 {
3540
avdd-dsi-csi-supply = <&vdd_dsi_csi>;
3641
status = "okay";
@@ -58,6 +63,13 @@
5863
};
5964
};
6065

66+
sor1: sor@54580000 {
67+
avdd-io-hdmi-dp-supply = <&pp1800>;
68+
vdd-hdmi-dp-pll-supply = <&avddio_1v05>;
69+
nvidia,dpaux = <&dpaux1>;
70+
status = "okay";
71+
};
72+
6173
dpaux: dpaux@545c0000 {
6274
status = "okay";
6375
};
@@ -1809,6 +1821,8 @@
18091821
status = "okay";
18101822
vbus-supply = <&usbc_vbus>;
18111823
mode = "otg";
1824+
usb-role-switch;
1825+
role-switch-default-mode = "host";
18121826
};
18131827

18141828
usb3-0 {
@@ -1843,6 +1857,17 @@
18431857
status = "okay";
18441858
};
18451859

1860+
usb@700d0000 {
1861+
phys = <&{/padctl@7009f000/pads/usb2/lanes/usb2-0}>,
1862+
<&{/padctl@7009f000/pads/pcie/lanes/pcie-6}>;
1863+
phy-names = "usb2-0", "usb3-0";
1864+
1865+
avddio-usb-supply = <&avddio_1v05>;
1866+
hvdd-usb-supply = <&pp3300>;
1867+
1868+
status = "okay";
1869+
};
1870+
18461871
clock@70110000 {
18471872
status = "okay";
18481873
nvidia,cf = <6>;

‎arch/arm64/boot/dts/nvidia/tegra234.dtsi‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
compatible = "nvidia,tegra234-misc";
4141
reg = <0x0 0x00100000 0x0 0xf000>,
4242
<0x0 0x0010f000 0x0 0x1000>;
43-
status = "okay";
4443
};
4544

4645
timer@2080000 {
@@ -62,7 +61,6 @@
6261
<GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>,
6362
<GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>,
6463
<GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
65-
status = "okay";
6664
};
6765

6866
gpio: gpio@2200000 {
@@ -2780,7 +2778,6 @@
27802778
"ch11", "ch12", "ch13", "ch14", "ch15";
27812779
interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
27822780
#interconnect-cells = <1>;
2783-
status = "okay";
27842781

27852782
#address-cells = <2>;
27862783
#size-cells = <2>;
@@ -2812,7 +2809,6 @@
28122809
interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>;
28132810
clocks = <&bpmp TEGRA234_CLK_EMC>;
28142811
clock-names = "emc";
2815-
status = "okay";
28162812

28172813
#interconnect-cells = <0>;
28182814

@@ -3888,7 +3884,6 @@
38883884
#iommu-cells = <1>;
38893885

38903886
nvidia,memory-controller = <&mc>;
3891-
status = "okay";
38923887
};
38933888

38943889
sce-fabric@b600000 {
@@ -3902,7 +3897,6 @@
39023897
compatible = "nvidia,tegra234-rce-fabric";
39033898
reg = <0x0 0xbe00000 0x0 0x40000>;
39043899
interrupts = <GIC_SPI 175 IRQ_TYPE_LEVEL_HIGH>;
3905-
status = "okay";
39063900
};
39073901

39083902
hsp_aon: hsp@c150000 {
@@ -4064,28 +4058,24 @@
40644058
compatible = "nvidia,tegra234-aon-fabric";
40654059
reg = <0x0 0xc600000 0x0 0x40000>;
40664060
interrupts = <GIC_SPI 172 IRQ_TYPE_LEVEL_HIGH>;
4067-
status = "okay";
40684061
};
40694062

40704063
bpmp-fabric@d600000 {
40714064
compatible = "nvidia,tegra234-bpmp-fabric";
40724065
reg = <0x0 0xd600000 0x0 0x40000>;
40734066
interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;
4074-
status = "okay";
40754067
};
40764068

40774069
dce-fabric@de00000 {
40784070
compatible = "nvidia,tegra234-dce-fabric";
40794071
reg = <0x0 0xde00000 0x0 0x40000>;
40804072
interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH>;
4081-
status = "okay";
40824073
};
40834074

40844075
ccplex@e000000 {
40854076
compatible = "nvidia,tegra234-ccplex-cluster";
40864077
reg = <0x0 0x0e000000 0x0 0x5ffff>;
40874078
nvidia,bpmp = <&bpmp>;
4088-
status = "okay";
40894079
};
40904080

40914081
gic: interrupt-controller@f400000 {
@@ -4239,7 +4229,6 @@
42394229
#iommu-cells = <1>;
42404230

42414231
nvidia,memory-controller = <&mc>;
4242-
status = "okay";
42434232
};
42444233

42454234
smmu_niso0: iommu@12000000 {
@@ -4381,14 +4370,12 @@
43814370
#iommu-cells = <1>;
43824371

43834372
nvidia,memory-controller = <&mc>;
4384-
status = "okay";
43854373
};
43864374

43874375
cbb-fabric@13a00000 {
43884376
compatible = "nvidia,tegra234-cbb-fabric";
43894377
reg = <0x0 0x13a00000 0x0 0x400000>;
43904378
interrupts = <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>;
4391-
status = "okay";
43924379
};
43934380

43944381
host1x@13e00000 {
@@ -5804,12 +5791,10 @@
58045791
pmu {
58055792
compatible = "arm,cortex-a78-pmu";
58065793
interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
5807-
status = "okay";
58085794
};
58095795

58105796
psci {
58115797
compatible = "arm,psci-1.0";
5812-
status = "okay";
58135798
method = "smc";
58145799
};
58155800

‎arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,16 @@
2323
status = "okay";
2424
};
2525

26+
cmdqv@5200000 {
27+
status = "okay";
28+
};
29+
2630
iommu@6000000 {
2731
status = "okay";
2832
};
33+
34+
cmdqv@6200000 {
35+
status = "okay";
36+
};
2937
};
3038
};

0 commit comments

Comments
 (0)