From e6e0f093d97872353bda8922456064dbcf5d82a2 Mon Sep 17 00:00:00 2001 From: Alex Elder Date: Wed, 11 Mar 2020 16:47:00 -0500 Subject: [PATCH] dt-bindings: soc: qcom: fix IPA binding The definitions for the "qcom,smem-states" and "qcom,smem-state-names" properties need to list their "$ref" under an "allOf" keyword. In addition, fix two problems in the example at the end: - Use #include for header files that define needed symbolic values - Terminate the line that includes the "ipa-shared" register space name with a comma rather than a semicolon Finally, update some white space in the example for better alignment. Signed-off-by: Alex Elder Signed-off-by: David S. Miller --- .../devicetree/bindings/net/qcom,ipa.yaml | 32 +++++++++++-------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Documentation/devicetree/bindings/net/qcom,ipa.yaml b/Documentation/devicetree/bindings/net/qcom,ipa.yaml index 91d08f2c7791..140f15245654 100644 --- a/Documentation/devicetree/bindings/net/qcom,ipa.yaml +++ b/Documentation/devicetree/bindings/net/qcom,ipa.yaml @@ -87,14 +87,16 @@ properties: - const: config qcom,smem-states: - $ref: /schemas/types.yaml#/definitions/phandle-array + allOf: + - $ref: /schemas/types.yaml#/definitions/phandle-array description: State bits used in by the AP to signal the modem. items: - description: Whether the "ipa-clock-enabled" state bit is valid - description: Whether the IPA clock is enabled (if valid) qcom,smem-state-names: - $ref: /schemas/types.yaml#/definitions/string-array + allOf: + - $ref: /schemas/types.yaml#/definitions/string-array description: The names of the state bits used for SMP2P output items: - const: ipa-clock-enabled-valid @@ -139,6 +141,10 @@ oneOf: examples: - | + #include + #include + #include + smp2p-mpss { compatible = "qcom,smp2p"; ipa_smp2p_out: ipa-ap-to-modem { @@ -162,17 +168,17 @@ examples: <0 0x1e47000 0 0x2000>, <0 0x1e04000 0 0x2c000>; reg-names = "ipa-reg", - "ipa-shared"; - "gsi"; + "ipa-shared", + "gsi"; interrupts-extended = <&intc 0 311 IRQ_TYPE_EDGE_RISING>, - <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>, - <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, - <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>; + <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>, + <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>, + <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>; interrupt-names = "ipa", - "gsi", - "ipa-clock-query", - "ipa-setup-ready"; + "gsi", + "ipa-clock-query", + "ipa-setup-ready"; clocks = <&rpmhcc RPMH_IPA_CLK>; clock-names = "core"; @@ -182,11 +188,11 @@ examples: <&rsc_hlos MASTER_IPA &rsc_hlos SLAVE_IMEM>, <&rsc_hlos MASTER_APPSS_PROC &rsc_hlos SLAVE_IPA_CFG>; interconnect-names = "memory", - "imem", - "config"; + "imem", + "config"; qcom,smem-states = <&ipa_smp2p_out 0>, - <&ipa_smp2p_out 1>; + <&ipa_smp2p_out 1>; qcom,smem-state-names = "ipa-clock-enabled-valid", "ipa-clock-enabled"; }; -- 2.20.1