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

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/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>

diff --combined arch/arm64/boot/dts/nvidia/tegra194.dtsi
index 2d48c3715fc640e3ff444eaca35944958dd661dd,6005e422c968113bd2436168afee426a09c35a5a..aaa00da5351dfa71be46801c15a1179e40d0eb34
--- 1/arch/arm64/boot/dts/nvidia/tegra194.dtsi
--- 2/arch/arm64/boot/dts/nvidia/tegra194.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra194.dtsi
@@@ -995,8 -995,9 +995,8 @@@
                                 <&bpmp TEGRA194_CLK_HDA2CODEC_2X>;
                        clock-names = "hda", "hda2hdmi", "hda2codec_2x";
                        resets = <&bpmp TEGRA194_RESET_HDA>,
 -                               <&bpmp TEGRA194_RESET_HDA2HDMICODEC>,
 -                               <&bpmp TEGRA194_RESET_HDA2CODEC_2X>;
 -                      reset-names = "hda", "hda2hdmi", "hda2codec_2x";
 +                               <&bpmp TEGRA194_RESET_HDA2HDMICODEC>;
 +                      reset-names = "hda", "hda2hdmi";
                        power-domains = <&bpmp TEGRA194_POWER_DOMAIN_DISP>;
                        interconnects = <&mc TEGRA194_MEMORY_CLIENT_HDAR &emc>,
                                        <&mc TEGRA194_MEMORY_CLIENT_HDAW &emc>;
@@@ -1584,7 -1585,7 +1584,7 @@@
                        #iommu-cells = <1>;
  
                        nvidia,memory-controller = <&mc>;
-                       status = "okay";
+                       status = "disabled";
                };
  
                smmu: iommu@12000000 {