diff --git a/configs/default_defconfig b/configs/default_defconfig
index 7f36ab2733719..d04dfb3fe7b26 100644
--- a/configs/default_defconfig
+++ b/configs/default_defconfig
@@ -729,6 +729,12 @@ CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
 endif
 endif
 
+ifeq ($(CONFIG_ARCH_LAHAINA), y)
+ifeq ($(CONFIG_IPA_OFFLOAD), y)
+CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
+endif
+endif
+
 ifeq ($(CONFIG_HELIUMPLUS), y)
 ifneq ($(CONFIG_ARCH_SDM630), y)
 ifneq ($(CONFIG_ARCH_SDM660), y)
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index 1e9aedbfed302..418b81107aa8c 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -64,7 +64,9 @@
 #include "dp_txrx.h"
 #ifdef ENABLE_SMMU_S1_TRANSLATION
 #include "pld_common.h"
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0))
 #include <asm/dma-iommu.h>
+#endif
 #include <linux/iommu.h>
 #endif