Merge "dt-bindings: Document qcom,initial-movable-zone-size property"

bindings/virtio/qcom,virtio-mem.yaml

@@ -1,10 +1,13 @@
 # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
 %YAML 1.2
 ---
-$id: "http://devicetree.org/schemas/soc/qcom/qcom,secure-buffer.yaml#"
+$id: "http://devicetree.org/schemas/virtio/qcom,virtio-mem.yaml#"
 $schema: "http://devicetree.org/meta-schemas/core.yaml#"
 
-title: Qualcomm Technologies, Inc. Virtio-Mem bindings
+title: Qualcomm Technologies, Inc. Virtio-Mem
+
+maintainers:
+  - Patrick Daly <quic_pdaly@quicinc.com>
 
 description: |
   QTI virtio mem driver supports Guest initiated memory hotplug operations
@@ -16,6 +19,7 @@ properties:
       - const: qcom,virtio-mem
 
   qcom,block-size:
+    $ref: '/schemas/types.yaml#/definitions/uint32'
     description:
       Minimum transfer size in bytes. Should be multiple of PAGE_SIZE.
 
@@ -31,6 +35,11 @@ properties:
       is allowed to choose when adding hotpluggable memory for this
       device.
 
+  qcom,initial-movable-zone-size:
+    $ref: '/schemas/types.yaml#/definitions/uint32'
+    description: |
+      Initial size of movable zone.
+
   qcom,memory-encryption:
     type: boolean
     description: |
@@ -39,14 +48,17 @@ properties:
 
 required:
   - compatible
-  - qcom,size
+  - qcom,max-size
   - qcom,ipa-range
   - qcom,block-size
 
-example:
+additionalProperties: false
+
+examples:
+  - |+
     virtio_mem_device@0x60000000 {
       compatible = "qcom,virtio-mem";
-		qcom,block_size = <0x400000>;
-		qcom,size = <0x0 0x10000000>;
+      qcom,block-size = <0x400000>;
+      qcom,max-size = <0x0 0x10000000>;
       qcom,ipa-range = <0x0 0x0 0xf 0xffffffff>;
     };

qcom/sun-vm.dtsi

@@ -707,13 +707,14 @@
 		qcom,vmid = <45>;
 	};
 
-	qcom,mem-buf-msgq {
+	mem_buf_msgq: qcom,mem-buf-msgq {
 		compatible = "qcom,mem-buf-msgq";
 		qcom,msgq-names = "trusted_vm";
 	};
 
 	virtio_mem_device {
 		compatible = "qcom,virtio-mem";
+		depends-on-supply = <&mem_buf_msgq>;
 		/* Must be memory_block_size_bytes() aligned */
 		qcom,max-size = <0x0 0x10000000>;
 		qcom,ipa-range = <0x0 0x0 0xf 0xffffffff>;