2 files changed, 9 insertions, 2 deletions

diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
index 75ee6cf1e1b4..14d7fea82daf 100644
--- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
+++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts
@@ -59,7 +59,7 @@
         };
 
         padctl@3520000 {
-                status = "okay";
+                status = "disabled";
 
                 avdd-pll-erefeut-supply = <&vdd_1v8_pll>;
                 avdd-usb-supply = <&vdd_3v3_sys>;
@@ -137,7 +137,7 @@
         };
 
         usb@3530000 {
-                status = "okay";
+                status = "disabled";
 
                 phys = <&{/padctl@3520000/pads/usb2/lanes/usb2-0}>,
                        <&{/padctl@3520000/pads/usb2/lanes/usb2-1}>,
diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
index f0bb6ced4976..426ac0bdf6a6 100644
--- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi
+++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi
@@ -60,6 +60,7 @@
                 clock-names = "master_bus", "slave_bus", "rx", "tx", "ptp_ref";
                 resets = <&bpmp TEGRA186_RESET_EQOS>;
                 reset-names = "eqos";
+                iommus = <&smmu TEGRA186_SID_EQOS>;
                 status = "disabled";
 
                 snps,write-requests = <1>;
@@ -338,6 +339,7 @@
                          <&bpmp TEGRA186_RESET_HDA2CODEC_2X>;
                 reset-names = "hda", "hda2hdmi", "hda2codec_2x";
                 power-domains = <&bpmp TEGRA186_POWER_DOMAIN_DISP>;
+                iommus = <&smmu TEGRA186_SID_HDA>;
                 status = "disabled";
         };
 
@@ -671,6 +673,10 @@
                          <&bpmp TEGRA186_RESET_PCIEXCLK>;
                 reset-names = "afi", "pex", "pcie_x";
 
+                iommus = <&smmu TEGRA186_SID_AFI>;
+                iommu-map = <0x0 &smmu TEGRA186_SID_AFI 0x1000>;
+                iommu-map-mask = <0x0>;
+
                 status = "disabled";
 
                 pci@1,0 {
@@ -1158,6 +1164,7 @@
 
         bpmp: bpmp {
                 compatible = "nvidia,tegra186-bpmp";
+                iommus = <&smmu TEGRA186_SID_BPMP>;
                 mboxes = <&hsp_top0 TEGRA_HSP_MBOX_TYPE_DB
                                     TEGRA_HSP_DB_MASTER_BPMP>;
                 shmem = <&cpu_bpmp_tx &cpu_bpmp_rx>;