Skip to content

Commit c667dcd

Browse files
committed
arm64: tegra: Enable SMMU support for USB on Tegra194
As of commit c7289b1 ("arm64: tegra: Enable SMMU support on Tegra194"), SMMU support is enabled system-wide on Tegra194. However, there was a bit of overlap between the SMMU enablement and the USB support addition, so the USB device tree nodes are missing the iommus and interconnects properties. This in turn leads to SMMU faults for these devices, since by default the ARM SMMU will fault. Add the iommus and interconnects properties to the XUSB and XUDC device tree nodes to restore their functionality. Fixes: c7289b1 ("arm64: tegra: Enable SMMU support on Tegra194") Reviewed-by: Jon Hunter <jonathanh@nvidia.com> Signed-off-by: Thierry Reding <treding@nvidia.com>
1 parent 34e0fc3 commit c667dcd

1 file changed

Lines changed: 8 additions & 0 deletions

File tree

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -948,6 +948,10 @@
948948
<&bpmp TEGRA194_CLK_XUSB_SS>,
949949
<&bpmp TEGRA194_CLK_XUSB_FS>;
950950
clock-names = "dev", "ss", "ss_src", "fs_src";
951+
interconnects = <&mc TEGRA194_MEMORY_CLIENT_XUSB_DEVR &emc>,
952+
<&mc TEGRA194_MEMORY_CLIENT_XUSB_DEVW &emc>;
953+
interconnect-names = "dma-mem", "write";
954+
iommus = <&smmu TEGRA194_SID_XUSB_DEV>;
951955
power-domains = <&bpmp TEGRA194_POWER_DOMAIN_XUSBB>,
952956
<&bpmp TEGRA194_POWER_DOMAIN_XUSBA>;
953957
power-domain-names = "dev", "ss";
@@ -977,6 +981,10 @@
977981
"xusb_ss", "xusb_ss_src", "xusb_hs_src",
978982
"xusb_fs_src", "pll_u_480m", "clk_m",
979983
"pll_e";
984+
interconnects = <&mc TEGRA194_MEMORY_CLIENT_XUSB_HOSTR &emc>,
985+
<&mc TEGRA194_MEMORY_CLIENT_XUSB_HOSTW &emc>;
986+
interconnect-names = "dma-mem", "write";
987+
iommus = <&smmu TEGRA194_SID_XUSB_HOST>;
980988

981989
power-domains = <&bpmp TEGRA194_POWER_DOMAIN_XUSBC>,
982990
<&bpmp TEGRA194_POWER_DOMAIN_XUSBA>;

0 commit comments

Comments
 (0)