diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 47351c6e0748..e1ffee195585 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -1425,6 +1425,7 @@ CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_ARM_SMMU_V3_SVA=y
+CONFIG_TEGRA241_CMDQV=y
 CONFIG_MTK_IOMMU=y
 CONFIG_QCOM_IOMMU=y
 CONFIG_REMOTEPROC=y
diff --git a/arch/arm64/configs/tegra_prod_defconfig b/arch/arm64/configs/tegra_prod_defconfig
index a70a22730cac..d599cf66cc9d 100644
--- a/arch/arm64/configs/tegra_prod_defconfig
+++ b/arch/arm64/configs/tegra_prod_defconfig
@@ -483,6 +483,7 @@ CONFIG_PLATFORM_MHU=y
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
+CONFIG_TEGRA241_CMDQV=y
 CONFIG_MTK_IOMMU=y
 CONFIG_REMOTEPROC=y
 CONFIG_MTK_PMIC_WRAP=y