From dbd66daf726cf1988c82f2caf338261b8e064ce8 Mon Sep 17 00:00:00 2001 From: Patrick Daly Date: Mon, 13 May 2024 16:36:55 -0700 Subject: [PATCH] dt-bindings: Fix dt_binding_check errors in qcom,msm-buf Only one top-level devicetree node can be defined per file; move qcom,mem-buf-msgq to its own. Fixes: ../Documentation/devicetree/bindings/soc/qcom/qcom,mem-buf.yaml:56:1: [error] duplication of key "properties" in mapping (key-duplicates). Change-Id: I8f7b5bdd94afa38ade3b2173ee2d99c6906cc74d Signed-off-by: Patrick Daly --- bindings/soc/qcom/qcom,mem-buf-msgq.yaml | 29 ++++++++++++++++++++++++ bindings/soc/qcom/qcom,mem-buf.yaml | 18 +++++---------- 2 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 bindings/soc/qcom/qcom,mem-buf-msgq.yaml diff --git a/bindings/soc/qcom/qcom,mem-buf-msgq.yaml b/bindings/soc/qcom/qcom,mem-buf-msgq.yaml new file mode 100644 index 00000000..0ebdec93 --- /dev/null +++ b/bindings/soc/qcom/qcom,mem-buf-msgq.yaml @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/soc/qcom/qcom,mem-buf-msgq.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Qualcomm Technologies, Inc. Memory Buffer Sharing Msgq driver + +maintainers: + - Chris Goldsworthy + +description: | + Provides inter-VM message transfer services to the qcom,mem-buf driver + +properties: + compatible: + items: + - const: qcom,mem-buf-msgq + +additionalProperties: false + +required: + - compatible + +examples: + - | + qcom,mem-buf-msgq { + compatible = "qcom,mem-buf-msgq"; + }; diff --git a/bindings/soc/qcom/qcom,mem-buf.yaml b/bindings/soc/qcom/qcom,mem-buf.yaml index 6065beb8..9d5ca59a 100644 --- a/bindings/soc/qcom/qcom,mem-buf.yaml +++ b/bindings/soc/qcom/qcom,mem-buf.yaml @@ -4,7 +4,7 @@ $id: "http://devicetree.org/schemas/soc/qcom/qcom,mem-buf.yaml#" $schema: "http://devicetree.org/meta-schemas/core.yaml#" -title: Qualcomm Technologies, Inc. Memory Buffer Sharing binding +title: Qualcomm Technologies, Inc. Memory Buffer Sharing Driver maintainers: - Chris Goldsworthy @@ -18,9 +18,12 @@ properties: items: - const: qcom,mem-buf qcom,vmid: + $ref: '/schemas/types.yaml#/definitions/uint32' description: integer ID of the current virtual machine. qcom,mem-buf-capabilities: + $ref: '/schemas/types.yaml#/definitions/string' + description: One of supplier, consumer, or dual. oneOf: - const: supplier description: @@ -39,6 +42,8 @@ properties: remote allocation requests, as well as request and accept memory from other VMs +additionalProperties: false + required: - compatible - qcom,mem-buf-capabilities @@ -49,14 +54,3 @@ examples: compatible = "qcom,mem-buf"; qcom,mem-buf-capabilities = "supplier"; }; - -description: | - Provides inter-VM message transfer services to the qcom,mem-buf driver - -properties: - compatible: - items: - - const: qcom,mem-buf-msgq - -required: - - compatible