diff --git a/arch/arm/configs/zynq_m2k_defconfig b/arch/arm/configs/zynq_m2k_defconfig
index 5ec86bdb4e9955..b098ccc532f02b 100644
--- a/arch/arm/configs/zynq_m2k_defconfig
+++ b/arch/arm/configs/zynq_m2k_defconfig
@@ -79,6 +79,7 @@ CONFIG_MTD_SPI_NOR=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_ADI_AXI_DATA_OFFLOAD=y
 CONFIG_SRAM=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
diff --git a/arch/arm/configs/zynq_pluto_defconfig b/arch/arm/configs/zynq_pluto_defconfig
index 63b05e9f3fc683..1da2a4b027d697 100644
--- a/arch/arm/configs/zynq_pluto_defconfig
+++ b/arch/arm/configs/zynq_pluto_defconfig
@@ -72,6 +72,7 @@ CONFIG_MTD_SPI_NOR=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_ADI_AXI_DATA_OFFLOAD=y
 CONFIG_ADI_AXI_TDD=y
 CONFIG_SRAM=y
 # CONFIG_MATHWORKS_IP_CORE is not set
diff --git a/drivers/iio/frequency/Kconfig b/drivers/iio/frequency/Kconfig
index 3a3d56e027eedd..f40098c9e43d53 100644
--- a/drivers/iio/frequency/Kconfig
+++ b/drivers/iio/frequency/Kconfig
@@ -108,6 +108,7 @@ config CF_AXI_DDS
 	tristate "Analog Devices CoreFPGA AXI DDS driver"
 	depends on SPI
 	depends on COMMON_CLK
+	depends on ADI_AXI_DATA_OFFLOAD
 	select IIO_BUFFER_DMAENGINE
 	help
 	  Say yes here to build support for Analog Devices DDS chip
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 22c16d096571f5..306c541113b42c 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -51,7 +51,7 @@ config AD525X_DPOT_SPI
 	  module will be called ad525x_dpot-spi.
 
 config ADI_AXI_DATA_OFFLOAD
-	bool "support Analog Devices Data Offload Engine"
+	tristate "support Analog Devices Data Offload Engine"
 	depends on HAS_IOMEM
 	depends on OF
 	help
diff --git a/drivers/misc/adi-axi-data-offload.h b/drivers/misc/adi-axi-data-offload.h
index 357bc7617eea0f..ce8a291cbc257a 100644
--- a/drivers/misc/adi-axi-data-offload.h
+++ b/drivers/misc/adi-axi-data-offload.h
@@ -12,31 +12,9 @@
 
 struct axi_data_offload_state;
 
-#ifdef CONFIG_ADI_AXI_DATA_OFFLOAD
-
 int axi_data_offload_ctrl_bypass(struct axi_data_offload_state *st, bool en);
 int axi_data_offload_ctrl_oneshot(struct axi_data_offload_state *st, bool en);
 
 struct axi_data_offload_state *devm_axi_data_offload_get_optional(struct device *source);
 
-#else
-
-static inline int axi_data_offload_ctrl_bypass(struct axi_data_offload_state *st, bool en)
-{
-	return -ENODEV;
-}
-
-static inline int axi_data_offload_ctrl_oneshot(struct axi_data_offload_state *st, bool en)
-{
-	return -ENODEV;
-}
-
-static inline struct
-axi_data_offload_state *devm_axi_data_offload_get_optional(struct device *source)
-{
-	return NULL;
-}
-
-#endif /* CONFIG_ADI_AXI_DATA_OFFLOAD */
-
 #endif /* ADI_AXI_DATA_OFFLOAD_H_ */