Merge "ARM: dts: qcom: Reserved GuestVM memory and add its PIL driver"

bindings/soc/qcom/qcom,guestvm-loader.yaml

@@ -0,0 +1,29 @@
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/msm/guestvm-loaderpsci.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Guest VM Loader
+
+maintainers:
+  - Prakruthi Deepak Heragu <pheragu@quicinc.com>
+  - Murali Nalajala <mnalajal@quicinc.com>
+
+properties:
+  compatible:
+    const: qcom,guestvm-loader
+
+  image_to_be_loaded:
+    $ref: /schemas/types.yaml#/definitions/string
+
+required:
+  - compatible
+  - image_to_be_loaded
+
+examples:
+  - |+
+    qcom,guestvm_loader {
+      compatible = "qcom,guestvm-loader";
+      image_to_be_loaded = "trustedvm";
+    };
+...

qcom/lahaina.dtsi

@@ -390,6 +390,12 @@
 			reg = <0x0 0xc0000000 0x0 0x5100000>;
 		};
 
+		pil_trustedvm_mem: pil_trustedvm_region@d0800000 {
+			compatible = "removed-dma-pool";
+			no-map;
+			reg = <0x0 0xd0800000 0x0 0x8000000>;
+		};
+
 		adsp_mem: adsp_region {
 			compatible = "shared-dma-pool";
 			alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
@@ -2979,6 +2985,19 @@
 		mbox-names = "spss-pil";
 	};
 
+	qcom,trustedvm@d0800000 {
+		compatible = "qcom,pil-tz-generic";
+		status = "ok"
+		qcom,pas-id = <28>;
+		qcom,firmware-name = "trustedvm";
+		memory-region = <&pil_trustedvm_mem>;
+	};
+
+	qcom,guestvm_loader {
+		compatible = "qcom,guestvm-loader";
+		image_to_be_loaded = "trustedvm";
+	};
+
 	ssc_sensors: qcom,msm-ssc-sensors {
 		compatible = "qcom,msm-ssc-sensors";
 		status = "ok"