Unverified Commit 537c3757 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.17-arm64-dt-fixes' of...

Merge tag 'tegra-for-5.17-arm64-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/fixes

arm64: tegra: Device tree fixes for v5.17

This contains a single, last-minute fix to disable the display SMMU by
default because under some circumstances leaving it enabled by default
can cause SMMU faults on boot.

* tag 'tegra-for-5.17-arm64-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: tegra: Disable ISO SMMU for Tegra194

Link: https://lore.kernel.org/r/20220307182120.2169598-1-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a0e897d1 ebea268e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -1584,7 +1584,7 @@
			#iommu-cells = <1>;

			nvidia,memory-controller = <&mc>;
			status = "okay";
			status = "disabled";
		};

		smmu: iommu@12000000 {