]> Git Repo - linux.git/commitdiff
Merge tag 'rpmsg-v5.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc...
authorLinus Torvalds <[email protected]>
Wed, 10 Aug 2022 18:28:14 +0000 (11:28 -0700)
committerLinus Torvalds <[email protected]>
Wed, 10 Aug 2022 18:28:14 +0000 (11:28 -0700)
Pull rpmsg fixes from Bjorn Andersson:
 "This fixes schema validation warnings in the Devicetree bindings for
  SMD and SMD RPM"

* tag 'rpmsg-v5.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  dt-bindings: soc: qcom: smd-rpm: extend example
  dt-bindings: soc: qcom: smd: reference SMD edge schema

1  2 
Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml
Documentation/devicetree/bindings/soc/qcom/qcom,smd.yaml

index 50f834563e19447d6b02db07fcd050736d5948da,49e73043cc99160b4b57e8a82523d62382a9ce71..09d5bfa920f20f37c3bca6e08edcd6b40f7d6823
@@@ -34,7 -34,6 +34,7 @@@ properties
        - qcom,rpm-apq8084
        - qcom,rpm-ipq6018
        - qcom,rpm-msm8226
 +      - qcom,rpm-msm8909
        - qcom,rpm-msm8916
        - qcom,rpm-msm8936
        - qcom,rpm-msm8953
@@@ -52,9 -51,6 +52,9 @@@
      $ref: /schemas/clock/qcom,rpmcc.yaml#
      unevaluatedProperties: false
  
 +  power-controller:
 +    $ref: /schemas/power/qcom,rpmpd.yaml#
 +
    qcom,smd-channels:
      $ref: /schemas/types.yaml#/definitions/string-array
      description: Channel name used for the RPM communication
@@@ -92,12 -88,33 +92,33 @@@ examples
              qcom,ipc = <&apcs 8 0>;
              qcom,smd-edge = <15>;
  
-                 rpm-requests {
-                         compatible = "qcom,rpm-msm8974";
-                         qcom,smd-channels = "rpm_requests";
+             rpm-requests {
+                 compatible = "qcom,rpm-msm8916";
+                 qcom,smd-channels = "rpm_requests";
+                 clock-controller {
+                     compatible = "qcom,rpmcc-msm8916", "qcom,rpmcc";
+                     #clock-cells = <1>;
+                     clocks = <&xo_board>;
+                     clock-names = "xo";
+                 };
  
-                         /* Regulator nodes to follow */
+                 power-controller {
+                     compatible = "qcom,msm8916-rpmpd";
+                     #power-domain-cells = <1>;
+                     operating-points-v2 = <&rpmpd_opp_table>;
+                     rpmpd_opp_table: opp-table {
+                         compatible = "operating-points-v2";
+                         opp-1 {
+                             opp-level = <1>;
+                         };
+                         opp-2 {
+                             opp-level = <2>;
+                         };
+                     };
                  };
              };
-      };
- ...
+         };
+     };
index 62bebb5f83bc271b270c5174b0e52074432fbe9d,60c38e22cb341811aca47da7fb40e448d3e68384..9b3efe97f47c36b0041781052d1ef10ceacfbfc3
@@@ -21,13 -21,51 +21,13 @@@ properties
  
  patternProperties:
    "^.*-edge|rpm$":
-     type: object
+     $ref: /schemas/remoteproc/qcom,smd-edge.yaml#
      description:
        Each subnode of the SMD node represents a remote subsystem or a remote
        processor of some sort - or in SMD language an "edge". The name of the
        edges are not important.
  
      properties:
 -      interrupts:
 -        maxItems: 1
 -
 -      label:
 -        $ref: /schemas/types.yaml#/definitions/string
 -        description:
 -          Name of the edge, used for debugging and identification purposes. The
 -          node name will be used if this is not present.
 -
 -      mboxes:
 -        maxItems: 1
 -        description:
 -          Reference to the mailbox representing the outgoing doorbell in APCS for
 -          this client.
 -
 -      qcom,ipc:
 -        $ref: /schemas/types.yaml#/definitions/phandle-array
 -        items:
 -          - items:
 -              - description: phandle to a syscon node representing the APCS registers
 -              - description: u32 representing offset to the register within the syscon
 -              - description: u32 representing the ipc bit within the register
 -        description:
 -          Three entries specifying the outgoing ipc bit used for signaling the
 -          remote processor.
 -
 -      qcom,smd-edge:
 -        $ref: /schemas/types.yaml#/definitions/uint32
 -        description:
 -          The identifier of the remote processor in the smd channel allocation
 -          table.
 -
 -      qcom,remote-pid:
 -        $ref: /schemas/types.yaml#/definitions/uint32
 -        description:
 -          The identifier for the remote processor as known by the rest of the
 -          system.
 -
        rpm-requests:
          type: object
          description:
  
          additionalProperties: true
  
 -    required:
 -      - interrupts
 -      - qcom,smd-edge
 -
 -    oneOf:
 -      - required:
 -          - mboxes
 -      - required:
 -          - qcom,ipc
 -
 -    additionalProperties: false
 +    unevaluatedProperties: false
  
  required:
    - compatible
This page took 0.063236 seconds and 4 git commands to generate.