diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index d25ac041677d..dca7e70b3ecd 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -260,7 +260,10 @@ config GENERIC_CALIBRATE_DELAY
 	def_bool y
 
 config ZONE_DMA32
-	def_bool y
+	bool "Enable or Disable Zone DMA"
+	default y
+	help
+	  This option enables/disables the DMA zone.
 
 config HAVE_GENERIC_GUP
 	def_bool y
diff --git a/arch/arm64/configs/vendor/lahaina_QGKI.config b/arch/arm64/configs/vendor/lahaina_QGKI.config
index 21d59b24df9f..9c6cceb40a6b 100644
--- a/arch/arm64/configs/vendor/lahaina_QGKI.config
+++ b/arch/arm64/configs/vendor/lahaina_QGKI.config
@@ -6,3 +6,4 @@ CONFIG_IOMMU_DEBUG=y
 CONFIG_IOMMU_DEBUG_TRACKING=y
 CONFIG_IOMMU_TESTS=y
 CONFIG_QCOM_SECURE_BUFFER=y
+# CONFIG_ZONE_DMA32 is not set
diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index 16a317eb40e3..8cd91f20490a 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -113,7 +113,7 @@ config QCOM_IOMMU_IO_PGTABLE_QUIRKS
 	  saved in the system cache, and disabling the write-allocate
 	  hint when saving page tables in the system cache.
 
-	  If unsure, say Y here.
+	  If unsure, say N here.
 
 endmenu