diff mbox series

[v3,5/6] dt-bindings: mailbox : arm,mhu: Use examples with matching schema

Message ID 20210604205710.1944363-6-sudeep.holla@arm.com
State Accepted
Commit 3a32f22cc21fd525c786a7f3d78497cd7a703b34
Headers show
Series dt-bindings: firmware: Convert SCPI and SCMI to json schema | expand

Commit Message

Sudeep Holla June 4, 2021, 8:57 p.m. UTC
Currently the example provided in arm,mhu schema complains as below:

    Documentation/devicetree/bindings/mailbox/arm,mhu.example.dt.yaml :0:0:
    /example-0/soc/scb@2e000000: failed to match any schema with compatible:
    ['fujitsu,mb86s70-scb-1.0']

Fix the same using examples based on Juno platform. The old SCPI firmware
used MHU with standard 32-bit data transfer protocol while the new SCMI
firmware uses MHU and expects to be used in doorbell mode. Update example
with SCPI and SCMI firmware nodes to demonstrate both 32-bit data transfer
and doorbell mode of MHU operations

Cc: Rob Herring <robh+dt@kernel.org>
Cc: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

---
 .../devicetree/bindings/mailbox/arm,mhu.yaml  | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 deletions(-)

-- 
2.25.1

Comments

Rob Herring (Arm) June 4, 2021, 10:25 p.m. UTC | #1
On Fri, 04 Jun 2021 21:57:09 +0100, Sudeep Holla wrote:
> Currently the example provided in arm,mhu schema complains as below:

> 

>     Documentation/devicetree/bindings/mailbox/arm,mhu.example.dt.yaml :0:0:

>     /example-0/soc/scb@2e000000: failed to match any schema with compatible:

>     ['fujitsu,mb86s70-scb-1.0']

> 

> Fix the same using examples based on Juno platform. The old SCPI firmware

> used MHU with standard 32-bit data transfer protocol while the new SCMI

> firmware uses MHU and expects to be used in doorbell mode. Update example

> with SCPI and SCMI firmware nodes to demonstrate both 32-bit data transfer

> and doorbell mode of MHU operations

> 

> Cc: Rob Herring <robh+dt@kernel.org>

> Cc: Viresh Kumar <viresh.kumar@linaro.org>

> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

> ---

>  .../devicetree/bindings/mailbox/arm,mhu.yaml  | 48 +++++++++++++++----

>  1 file changed, 38 insertions(+), 10 deletions(-)

> 


Applied, thanks!
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/mailbox/arm,mhu.yaml b/Documentation/devicetree/bindings/mailbox/arm,mhu.yaml
index 496308d91a86..bd49c201477d 100644
--- a/Documentation/devicetree/bindings/mailbox/arm,mhu.yaml
+++ b/Documentation/devicetree/bindings/mailbox/arm,mhu.yaml
@@ -101,11 +101,19 @@  additionalProperties: false
             clocks = <&clock 0 2 1>;
             clock-names = "apb_pclk";
         };
+    };
 
-        mhu_client_scb: scb@2e000000 {
-            compatible = "fujitsu,mb86s70-scb-1.0";
-            reg = <0 0x2e000000 0 0x4000>;
+    firmware {
+        scpi {
+            compatible = "arm,scpi";
             mboxes = <&mhuA 1>; /* HP-NonSecure */
+            shmem = <&cpu_scp_hpri>; /* HP-NonSecure */
+
+            scpi_devpd: power-controller {
+                compatible = "arm,scpi-power-domains";
+                num-domains = <2>;
+                #power-domain-cells = <1>;
+            };
         };
     };
 
@@ -125,16 +133,36 @@  additionalProperties: false
             clocks = <&clock 0 2 1>;
             clock-names = "apb_pclk";
         };
+    };
 
-        scpi {
-            compatible = "arm,scpi";
-            mboxes = <&mhuB 1 4>; /* HP-NonSecure, 5th doorbell */
-            shmem = <&cpu_scp_hpri>; /* HP-NonSecure */
+    firmware {
+        scmi {
+            compatible = "arm,scmi";
+            mboxes = <&mhuB 0 0>, /* LP-NonSecure, 1st doorbell */
+                     <&mhuB 0 1>; /* LP-NonSecure, 2nd doorbell */
+            mbox-names = "tx", "rx";
+            shmem = <&cpu_scp_lpri0>,
+                    <&cpu_scp_lpri1>;
 
-            scpi_devpd: power-controller {
-                compatible = "arm,scpi-power-domains";
-                num-domains = <2>;
+            #address-cells = <1>;
+            #size-cells = <0>;
+
+            scmi_devpd: protocol@11 {
+                reg = <0x11>;
                 #power-domain-cells = <1>;
             };
+
+            scmi_dvfs: protocol@13 {
+                reg = <0x13>;
+                #clock-cells = <1>;
+
+                mboxes = <&mhuB 1 2>, /* HP-NonSecure, 3rd doorbell */
+                         <&mhuB 1 3>; /* HP-NonSecure, 4th doorbell */
+                mbox-names = "tx", "rx";
+                shmem = <&cpu_scp_hpri0>,
+                        <&cpu_scp_hpri1>;
+            };
         };
     };
+
+...