diff --git a/drivers/misc/mic/Kconfig b/drivers/misc/mic/Kconfig
index ed05333c40dc..e090f045d837 100644
--- a/drivers/misc/mic/Kconfig
+++ b/drivers/misc/mic/Kconfig
@@ -22,7 +22,7 @@ comment "SCIF Bus Driver"
 
 config SCIF_BUS
 	tristate "SCIF Bus Driver"
-	depends on 64BIT && PCI && X86
+	depends on 64BIT && PCI
 	help
 	  This option is selected by any driver which registers a
 	  device or driver on the SCIF Bus, such as CONFIG_INTEL_MIC_HOST
@@ -95,7 +95,7 @@ comment "IMX MIC Host Driver"
 config IMX_MIC_HOST
 	tristate "IMX MIC HOST Driver"
 	depends on ARM64 && PCI && CMA
-	depends on VOP_BUS && MIC_COSM
+	depends on VOP_BUS && SCIF_BUS && MIC_COSM
 	help
 	  Enable MIC host for i.MX plaforms, actually it is a virtnet over PCIe
 	  based on VOP framework.
@@ -108,7 +108,7 @@ comment "IMX MIC Card Driver"
 config IMX_MIC_CARD
 	tristate "IMX MIC Card Driver"
 	depends on ARM64
-	depends on VOP_BUS
+	depends on VOP_BUS && SCIF_BUS && MIC_COSM
 	select VIRTIO
 	help
 	  Enable MIC card for i.MX plaforms, actually it is a virtnet over PCIe
@@ -121,7 +121,7 @@ comment "SCIF Driver"
 
 config SCIF
 	tristate "SCIF Driver"
-	depends on 64BIT && PCI && X86 && SCIF_BUS && IOMMU_SUPPORT
+	depends on 64BIT && PCI && SCIF_BUS && IOMMU_SUPPORT
 	select IOMMU_IOVA
 	help
 	  This enables SCIF Driver support for the Intel Many Integrated
@@ -141,7 +141,7 @@ comment "Intel MIC Coprocessor State Management (COSM) Drivers"
 
 config MIC_COSM
 	tristate "Intel MIC Coprocessor State Management (COSM) Drivers"
-	depends on 64BIT && PCI && X86 && SCIF
+	depends on 64BIT && PCI && SCIF
 	help
 	  This enables COSM driver support for the Intel Many
 	  Integrated Core (MIC) family of PCIe form factor coprocessor
diff --git a/drivers/misc/mic/cosm/cosm_debugfs.c b/drivers/misc/mic/cosm/cosm_debugfs.c
index 2fc9f4bf7001..10bdbfa5d369 100644
--- a/drivers/misc/mic/cosm/cosm_debugfs.c
+++ b/drivers/misc/mic/cosm/cosm_debugfs.c
@@ -12,6 +12,10 @@
 #include <linux/io.h>
 #include "cosm_main.h"
 
+#ifndef __START_KERNEL_map
+#define __START_KERNEL_map 0
+#endif
+
 /* Debugfs parent dir */
 static struct dentry *cosm_dbg;
 
diff --git a/drivers/misc/mic/scif/scif_rma.c b/drivers/misc/mic/scif/scif_rma.c
index 01e27682ea30..d7fb42c39cf0 100644
--- a/drivers/misc/mic/scif/scif_rma.c
+++ b/drivers/misc/mic/scif/scif_rma.c
@@ -6,7 +6,6 @@
  *
  * Intel SCIF driver.
  */
-#include <linux/intel-iommu.h>
 #include <linux/pagemap.h>
 #include <linux/sched/mm.h>
 #include <linux/sched/signal.h>
diff --git a/drivers/misc/mic/scif/scif_rma.h b/drivers/misc/mic/scif/scif_rma.h
index 964dd0fc3657..b1748725e91c 100644
--- a/drivers/misc/mic/scif/scif_rma.h
+++ b/drivers/misc/mic/scif/scif_rma.h
@@ -53,7 +53,6 @@
 #ifndef SCIF_RMA_H
 #define SCIF_RMA_H
 
-#include <linux/intel-iommu.h>
 #include <linux/mmu_notifier.h>
 
 #include "../bus/scif_bus.h"
@@ -72,6 +71,10 @@
 #define SCIF_DMA_64BIT_PFN SCIF_IOVA_PFN(DMA_BIT_MASK(64))
 #define SCIF_DMA_63BIT_PFN SCIF_IOVA_PFN(DMA_BIT_MASK(63))
 
+#ifndef intel_iommu_enabled
+#define intel_iommu_enabled 0
+#endif
+
 /*
  * struct scif_endpt_rma_info - Per Endpoint Remote Memory Access Information
  *