diff --git a/drivers/tzlog_dump/Android.mk b/drivers/tzlog_dump/Android.mk
index 347812c3a101..b207987f4b37 100644
--- a/drivers/tzlog_dump/Android.mk
+++ b/drivers/tzlog_dump/Android.mk
@@ -5,4 +5,5 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := tzlog_dump.ko
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT)
+LOCAL_ADDITIONAL_DEPENDENCIES := $(KERNEL_MODULES_OUT)/mmi_info.ko
 include $(DLKM_DIR)/AndroidKernelModule.mk
diff --git a/drivers/tzlog_dump/Kbuild b/drivers/tzlog_dump/Kbuild
index c7082a8db499..72c4fbf7ce22 100644
--- a/drivers/tzlog_dump/Kbuild
+++ b/drivers/tzlog_dump/Kbuild
@@ -1,5 +1,8 @@
 # add -Wall to try to catch everything we can.
 EXTRA_CFLAGS += -Wall
-EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
+EXTRA_CFLAGS += -I$(ANDROID_BUILD_TOP)/motorola/kernel/modules/include
 
-obj-m += tzlog_dump.o
\ No newline at end of file
+obj-m += tzlog_dump.o
+KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../mmi_annotate/Module.symvers
+KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../mmi_info/Module.symvers
+KBUILD_EXTRA_SYMBOLS += $(KBUILD_OUTPUT)/Module.symver
diff --git a/drivers/tzlog_dump/tzlog_dump.c b/drivers/tzlog_dump/tzlog_dump.c
index e49920eccead..c61144c50240 100644
--- a/drivers/tzlog_dump/tzlog_dump.c
+++ b/drivers/tzlog_dump/tzlog_dump.c
@@ -31,6 +31,7 @@
 #include <soc/qcom/memory_dump.h>
 #include <soc/qcom/mmi_boot_info.h>
 #include <linux/mmi_annotate.h>
+#include <linux/version.h>
 
 /* Check memory_dump.h to verify this is not going over the max or
  * conflicting with another entry. Also must match BL
@@ -286,8 +287,12 @@ static int tzlog_dump_probe(struct platform_device *pdev)
 
 	tzlog_dump_table_register(dev, pdata);
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,4,0)
+	tzdbg_data = ioremap_wc(pdata->mem_address, pdata->mem_size);
+#else
 	tzdbg_data = dma_remap(dev, NULL, pdata->mem_address,
 					pdata->mem_size, 0);
+#endif
 
 	if (!tzdbg_data) {
 		dev_err(dev, "Cannot remap buffer %pa size %zx\n",