From 41d404f51a756f60d43ca3178c7142367efd0f35 Mon Sep 17 00:00:00 2001
From: Edgar Flores <edgarf@codeaurora.org>
Date: Tue, 21 Jan 2020 14:27:56 -0800
Subject: [PATCH] msm: adsprpc: Initialize adsp memory region

Initialize adsp memory region.

Change-Id: Ibbd95691227c6f5e3311afc739b252e8c104f0ae
Signed-off-by: Edgar Flores <edgarf@codeaurora.org>
---
 drivers/char/adsprpc.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drivers/char/adsprpc.c b/drivers/char/adsprpc.c
index d3579754ba3e..4c068ecafa2a 100644
--- a/drivers/char/adsprpc.c
+++ b/drivers/char/adsprpc.c
@@ -43,6 +43,7 @@
 #include <linux/pm_qos.h>
 #include <linux/stat.h>
 #include <linux/preempt.h>
+#include <linux/of_reserved_mem.h>
 
 #define CREATE_TRACE_POINTS
 #include <trace/events/fastrpc.h>
@@ -4798,7 +4799,12 @@ static int fastrpc_probe(struct platform_device *pdev)
 	if (of_device_is_compatible(dev->of_node,
 					"qcom,msm-adsprpc-mem-region")) {
 		me->dev = dev;
-		return 0;
+		ret = of_reserved_mem_device_init_by_idx(dev, dev->of_node, 0);
+		if (ret) {
+			pr_warn("adsprpc: Error: %s: initialization of memory region adsp_mem failed with %d\n",
+				__func__, ret);
+		}
+		goto bail;
 	}
 	me->legacy_remote_heap = of_property_read_bool(dev->of_node,
 					"qcom,fastrpc-legacy-remote-heap");
@@ -5064,6 +5070,7 @@ static void __exit fastrpc_device_exit(void)
 	device_destroy(me->class, MKDEV(MAJOR(me->dev_no),
 					 MINOR_NUM_SECURE_DEV));
 
+	of_reserved_mem_device_release(me->dev);
 	class_destroy(me->class);
 	cdev_del(&me->cdev);
 	unregister_chrdev_region(me->dev_no, NUM_CHANNELS);