diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2022-03-07 23:23:56 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-03-07 23:23:58 +0100 |
| commit | 537c3757b4e3116ad5ab039029b830224f9154d9 (patch) | |
| tree | e308150d04307553a44795c308846067dd294e37 /arch | |
| parent | arm64: dts: armada-3720-turris-mox: Add missing ethernet0 alias (diff) | |
| parent | arm64: tegra: Disable ISO SMMU for Tegra194 (diff) | |
| download | linux-dev-537c3757b4e3116ad5ab039029b830224f9154d9.tar.xz linux-dev-537c3757b4e3116ad5ab039029b830224f9154d9.zip | |
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/nvidia/tegra194.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/nvidia/tegra194.dtsi b/arch/arm64/boot/dts/nvidia/tegra194.dtsi index 2d48c3715fc6..aaa00da5351d 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi @@ -1584,7 +1584,7 @@ #iommu-cells = <1>; nvidia,memory-controller = <&mc>; - status = "okay"; + status = "disabled"; }; smmu: iommu@12000000 { |