Skip to content

Commit 73ac18d

Browse files
committed
Merge tag 'tegra-for-6.14-arm64-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt
arm64: tegra: Device tree fixes for v6.14-rc1 These patches fix up an issue with the DMA support on one of the SPI controllers, as well as properly identify the SCE fabric and disable it to prevent accessing registers that may not be accessible to the CPU. Finally, the GIC's #address-cells property is set to 0 to fix a problem in the PCIe interrupt-map property. * tag 'tegra-for-6.14-arm64-dt' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: arm64: tegra: Fix Tegra234 PCIe interrupt-map arm64: tegra: Disable Tegra234 sce-fabric node arm64: tegra: Fix typo in Tegra234 dce-fabric compatible arm64: tegra: Fix DMA ID for SPI2 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 664b7a5 + b615fbd commit 73ac18d

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3815,7 +3815,7 @@
38153815
compatible = "nvidia,tegra234-sce-fabric";
38163816
reg = <0x0 0xb600000 0x0 0x40000>;
38173817
interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
3818-
status = "okay";
3818+
status = "disabled";
38193819
};
38203820

38213821
rce-fabric@be00000 {
@@ -3900,7 +3900,7 @@
39003900
assigned-clock-parents = <&bpmp TEGRA234_CLK_PLLP_OUT0>;
39013901
resets = <&bpmp TEGRA234_RESET_SPI2>;
39023902
reset-names = "spi";
3903-
dmas = <&gpcdma 19>, <&gpcdma 19>;
3903+
dmas = <&gpcdma 16>, <&gpcdma 16>;
39043904
dma-names = "rx", "tx";
39053905
dma-coherent;
39063906
status = "disabled";
@@ -3995,7 +3995,7 @@
39953995
};
39963996

39973997
dce-fabric@de00000 {
3998-
compatible = "nvidia,tegra234-sce-fabric";
3998+
compatible = "nvidia,tegra234-dce-fabric";
39993999
reg = <0x0 0xde00000 0x0 0x40000>;
40004000
interrupts = <GIC_SPI 381 IRQ_TYPE_LEVEL_HIGH>;
40014001
status = "okay";
@@ -4018,6 +4018,8 @@
40184018
#redistributor-regions = <1>;
40194019
#interrupt-cells = <3>;
40204020
interrupt-controller;
4021+
4022+
#address-cells = <0>;
40214023
};
40224024

40234025
smmu_iso: iommu@10000000 {

0 commit comments

Comments
 (0)