From 8aeb1fcf832d4e06157a1bed1d18ba244c1fe9ee Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Thu, 24 Mar 2022 11:58:10 +0000 Subject: [PATCH] fix(morello): dts: fix SCMI shmem/mboxes grouping The official Arm MHU DT binding suggests to group the shmem (and mboxes) values to signify the number of mailboxes supported. Linux' "make dtbs_check" reports: ============ .../morello-soc.dt.yaml: scmi: shmem:0: [17, 18] is too long From schema: dt-schema.git/dtschema/schemas/mbox/mbox-consumer.yaml ============ Add angle brackets at the right location to mark the boundaries between the two mailbox instances used. Signed-off-by: Andre Przywara Change-Id: If585c98b5e8e55cd5c0b1261e03ce4b91a4c0413 --- fdts/morello-fvp.dts | 4 ++-- fdts/morello-soc.dts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fdts/morello-fvp.dts b/fdts/morello-fvp.dts index 69c2abcbf..065535ee0 100644 --- a/fdts/morello-fvp.dts +++ b/fdts/morello-fvp.dts @@ -144,8 +144,8 @@ scmi { compatible = "arm,scmi"; mbox-names = "tx", "rx"; - mboxes = <&mailbox 1 0 &mailbox 1 1>; - shmem = <&cpu_scp_hpri0 &cpu_scp_hpri1>; + mboxes = <&mailbox 1 0>, <&mailbox 1 1>; + shmem = <&cpu_scp_hpri0>, <&cpu_scp_hpri1>; #address-cells = <1>; #size-cells = <0>; diff --git a/fdts/morello-soc.dts b/fdts/morello-soc.dts index e1c7a7808..22fd2ac91 100644 --- a/fdts/morello-soc.dts +++ b/fdts/morello-soc.dts @@ -221,8 +221,8 @@ scmi { compatible = "arm,scmi"; mbox-names = "tx", "rx"; - mboxes = <&mailbox 1 0 &mailbox 1 1>; - shmem = <&cpu_scp_hpri0 &cpu_scp_hpri1>; + mboxes = <&mailbox 1 0>, <&mailbox 1 1>; + shmem = <&cpu_scp_hpri0>, <&cpu_scp_hpri1>; #address-cells = <1>; #size-cells = <0>; scmi_dvfs: protocol@13 {