From 3701fa5cc01d2796a95e37f31f6aa549802e4480 Mon Sep 17 00:00:00 2001
From: Chris Lew <clew@quicinc.com>
Date: Thu, 11 Jun 2020 13:36:34 -0700
Subject: [PATCH 1/3] ARM: dts: msm: Add neuron peer-name for lahaina

Add peer-name value to the neuron device tree nodes. This information
is used by the neuron channel drivers to identify which vm to share
its memory region with.

Change-Id: I8fa7b24e667ef0e01b07be48776e1b2f9a5847a9
---
 qcom/lahaina.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi
index ea92a7ac7215..77f7dba41612 100644
--- a/qcom/lahaina.dtsi
+++ b/qcom/lahaina.dtsi
@@ -2117,6 +2117,7 @@
 			shared-buffer = <&chan0_shbuf>;
 			qcom,primary;
 			haven-label = <1>;
+			peer-name = <2>;
 		};
 
 		channel@1 {
@@ -2128,6 +2129,7 @@
 			shared-buffer = <&chan1_shbuf>;
 			qcom,primary;
 			haven-label = <2>;
+			peer-name = <2>;
 		};
 	};
 

From e637db357a7c307ca320f350dba833465cd73d53 Mon Sep 17 00:00:00 2001
From: Chris Lew <clew@quicinc.com>
Date: Fri, 12 Jun 2020 10:48:23 -0700
Subject: [PATCH 2/3] ARM: dts: msm: Add qrtr peer-name for lahaina

Add peer-name value to the qrtr haven device tree node. This information
is used by the qrtr haven driver to identify which vm to share its
memory region with.

Change-Id: Id322420faba0c4d553994a724e78862c2543a53c
---
 qcom/lahaina.dtsi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qcom/lahaina.dtsi b/qcom/lahaina.dtsi
index 77f7dba41612..c977d7d4e23f 100644
--- a/qcom/lahaina.dtsi
+++ b/qcom/lahaina.dtsi
@@ -2150,6 +2150,7 @@
 		compatible = "qcom,qrtr-haven";
 		qcom,master;
 		haven-label = <3>;
+		peer-name = <2>;
 		shared-buffer = <&qrtr_shbuf>;
 	};
 

From b9e55a31361d65c31584c95ebdccaf10cf0a469f Mon Sep 17 00:00:00 2001
From: Chris Lew <clew@quicinc.com>
Date: Tue, 16 Jun 2020 12:52:44 -0700
Subject: [PATCH 3/3] ARM: dts: msm: Add qcom,labels for trustedvm

Add the qcom,label properties to the reserved memory region nodes in
the trustvm so RM can match up the nodes to the hyp assigned memory
through the assigned labels from lookup_sgl.

Change-Id: Iba2abbbf2a8d7335306d9466fc27caad55af72a5
---
 qcom/trustedvm.dtsi | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/qcom/trustedvm.dtsi b/qcom/trustedvm.dtsi
index f70d25236039..14c62b69d15c 100644
--- a/qcom/trustedvm.dtsi
+++ b/qcom/trustedvm.dtsi
@@ -56,16 +56,19 @@
 		qrtr_shbuf: qrtr-shmem {
 			no-map;
 			reg = <0x0 0x2fef7000 0x0 0x9000>;
+			qcom,label = <3>;
 		};
 
 		chan0_shbuf: neuron-block@0 {
 			no-map;
 			reg = <0x0 0x2ff00000 0x0 0x80000>;
+			qcom,label = <1>;
 		};
 
 		chan1_shbuf: neuron-block@1 {
 			no-map;
 			reg = <0x0 0x2ff80000 0x0 0x80000>;
+			qcom,label = <2>;
 		};
 	};