diff --git a/drivers/soc/qcom/dcc_v2.c b/drivers/soc/qcom/dcc_v2.c
index 795e1cfc2e5d..ccaaea742a48 100644
--- a/drivers/soc/qcom/dcc_v2.c
+++ b/drivers/soc/qcom/dcc_v2.c
@@ -15,7 +15,6 @@
 #include <linux/slab.h>
 #include <linux/uaccess.h>
 #include <soc/qcom/memory_dump.h>
-#include <soc/qcom/scm.h>
 #include <dt-bindings/soc/qcom,dcc_v2.h>
 
 #define TIMEOUT_US		(100)
diff --git a/drivers/soc/qcom/memory_dump_v2.c b/drivers/soc/qcom/memory_dump_v2.c
index 49f93c9b604c..2eff0ac56faa 100644
--- a/drivers/soc/qcom/memory_dump_v2.c
+++ b/drivers/soc/qcom/memory_dump_v2.c
@@ -12,15 +12,13 @@
 #include <linux/of_address.h>
 #include <soc/qcom/minidump.h>
 #include <soc/qcom/memory_dump.h>
-#include <soc/qcom/scm.h>
+#include <linux/qcom_scm.h>
 #include <linux/of_device.h>
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
 
 #define MSM_DUMP_TABLE_VERSION		MSM_DUMP_MAKE_VERSION(2, 0)
 
-#define SCM_CMD_DEBUG_LAR_UNLOCK	0x4
-
 struct msm_dump_table {
 	uint32_t version;
 	uint32_t num_entries;
@@ -227,29 +225,6 @@ err0:
 }
 early_initcall(init_memory_dump);
 
-#ifdef CONFIG_MSM_DEBUG_LAR_UNLOCK
-static int __init init_debug_lar_unlock(void)
-{
-	int ret;
-	uint32_t argument = 0;
-	struct scm_desc desc = {0};
-
-	if (!is_scm_armv8())
-		ret = scm_call(SCM_SVC_TZ, SCM_CMD_DEBUG_LAR_UNLOCK, &argument,
-			       sizeof(argument), NULL, 0);
-	else
-		ret = scm_call2(SCM_SIP_FNID(SCM_SVC_TZ,
-				SCM_CMD_DEBUG_LAR_UNLOCK), &desc);
-	if (ret)
-		pr_err("Core Debug Lock unlock failed, ret: %d\n", ret);
-	else
-		pr_info("Core Debug Lock unlocked\n");
-
-	return ret;
-}
-early_initcall(init_debug_lar_unlock);
-#endif
-
 static int mem_dump_probe(struct platform_device *pdev)
 {
 	struct device_node *child_node;