Skip to content

Commit 562ed38

Browse files
committed
Merge tag 'mailbox-v6.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar: - qcom: misc changes to bindings for sa8775p, QDU1000/QRU1000, IPQ5332, SDX55, msm8976, glink-rpm-edge - sti: convert to DT schema - zynq: switch to flexible array to simplify code * tag 'mailbox-v6.3' of git://git.linaro.org/landing-teams/working/fujitsu/integration: dt-bindings: mailbox: qcom-ipcc: Add compatible for QDU1000/QRU1000 mailbox: qcom-apcs-ipc: add IPQ5332 APSS clock support dt-bindings: mailbox: qcom: add compatible for the IPQ5332 SoC dt-bindings: remoteproc: qcom,glink-rpm-edge: convert to DT schema mailbox: qcom-apcs-ipc: enable APCS clock device for MSM8996 dt-bindings: mailbox: qcom: add #clock-cells to msm8996 example dt-bindings: mailbox: qcom: add missing platforms to conditional clauses dt-bindings: mailbox: qcom: correct the list of platforms using clocks dt-bindings: mailbox: qcom: enable syscon compatible for msm8976 dt-bindings: mailbox: qcom: add SDX55 compatible dt-bindings: mailbox: qcom-ipcc: document the sa8775p platform dt-bindings: mailbox: sti-mailbox: convert to DT schema mailbox: zynq: Switch to flexible array to simplify code
2 parents 2e3036a + 6ccbe33 commit 562ed38

File tree

8 files changed

+197
-164
lines changed

8 files changed

+197
-164
lines changed

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@ maintainers:
1616
properties:
1717
compatible:
1818
oneOf:
19+
- items:
20+
- enum:
21+
- qcom,ipq5332-apcs-apps-global
22+
- const: qcom,ipq6018-apcs-apps-global
1923
- items:
2024
- enum:
2125
- qcom,ipq6018-apcs-apps-global
2226
- qcom,ipq8074-apcs-apps-global
23-
- qcom,msm8976-apcs-kpss-global
2427
- qcom,msm8996-apcs-hmss-global
2528
- qcom,msm8998-apcs-hmss-global
2629
- qcom,qcm2290-apcs-hmss-global
@@ -37,8 +40,10 @@ properties:
3740
- qcom,msm8916-apcs-kpss-global
3841
- qcom,msm8939-apcs-kpss-global
3942
- qcom,msm8953-apcs-kpss-global
43+
- qcom,msm8976-apcs-kpss-global
4044
- qcom,msm8994-apcs-kpss-global
4145
- qcom,qcs404-apcs-apps-global
46+
- qcom,sdx55-apcs-gcc
4247
- const: syscon
4348
reg:
4449
maxItems: 1
@@ -71,15 +76,8 @@ allOf:
7176
compatible:
7277
enum:
7378
- qcom,msm8916-apcs-kpss-global
74-
- qcom,msm8994-apcs-kpss-global
75-
- qcom,msm8996-apcs-hmss-global
76-
- qcom,msm8998-apcs-hmss-global
79+
- qcom,msm8939-apcs-kpss-global
7780
- qcom,qcs404-apcs-apps-global
78-
- qcom,sc7180-apss-shared
79-
- qcom,sdm660-apcs-hmss-global
80-
- qcom,sdm845-apss-shared
81-
- qcom,sm6125-apcs-hmss-global
82-
- qcom,sm8150-apss-shared
8381
then:
8482
properties:
8583
clocks:
@@ -110,9 +108,10 @@ allOf:
110108
- if:
111109
properties:
112110
compatible:
113-
enum:
114-
- qcom,ipq6018-apcs-apps-global
115-
- qcom,ipq8074-apcs-apps-global
111+
contains:
112+
enum:
113+
- qcom,ipq6018-apcs-apps-global
114+
- qcom,ipq8074-apcs-apps-global
116115
then:
117116
properties:
118117
clocks:
@@ -123,12 +122,37 @@ allOf:
123122
items:
124123
- const: pll
125124
- const: xo
125+
126126
- if:
127127
properties:
128128
compatible:
129129
enum:
130-
- qcom,ipq6018-apcs-apps-global
131-
- qcom,ipq8074-apcs-apps-global
130+
- qcom,msm8953-apcs-kpss-global
131+
- qcom,msm8976-apcs-kpss-global
132+
- qcom,msm8994-apcs-kpss-global
133+
- qcom,msm8996-apcs-hmss-global
134+
- qcom,msm8998-apcs-hmss-global
135+
- qcom,qcm2290-apcs-hmss-global
136+
- qcom,sc7180-apss-shared
137+
- qcom,sc8180x-apss-shared
138+
- qcom,sdm660-apcs-hmss-global
139+
- qcom,sdm845-apss-shared
140+
- qcom,sm4250-apcs-hmss-global
141+
- qcom,sm6115-apcs-hmss-global
142+
- qcom,sm6125-apcs-hmss-global
143+
- qcom,sm8150-apss-shared
144+
then:
145+
properties:
146+
clocks: false
147+
clock-names: false
148+
149+
- if:
150+
properties:
151+
compatible:
152+
contains:
153+
enum:
154+
- qcom,ipq6018-apcs-apps-global
155+
- qcom,ipq8074-apcs-apps-global
132156
then:
133157
properties:
134158
'#clock-cells':
@@ -148,6 +172,7 @@ examples:
148172
reg = <0x9820000 0x1000>;
149173
150174
#mbox-cells = <1>;
175+
#clock-cells = <0>;
151176
};
152177
153178
rpm-glink {

Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ properties:
2424
compatible:
2525
items:
2626
- enum:
27+
- qcom,qdu1000-ipcc
28+
- qcom,sa8775p-ipcc
2729
- qcom,sc7280-ipcc
2830
- qcom,sc8280xp-ipcc
2931
- qcom,sm6350-ipcc
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/mailbox/st,sti-mailbox.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: STMicroelectronics Mailbox Driver for STi platform
8+
9+
description:
10+
Each ST Mailbox IP currently consists of 4 instances of 32 channels.
11+
Messages are passed between Application and Remote processors using
12+
shared memory.
13+
14+
maintainers:
15+
- Patrice Chotard <[email protected]>
16+
17+
properties:
18+
compatible:
19+
const: st,stih407-mailbox
20+
21+
reg:
22+
maxItems: 1
23+
24+
mbox-name:
25+
$ref: /schemas/types.yaml#/definitions/string
26+
description: name of the mailbox IP
27+
28+
interrupts:
29+
description: the irq line for the RX mailbox
30+
maxItems: 1
31+
32+
"#mbox-cells":
33+
const: 2
34+
35+
required:
36+
- compatible
37+
- reg
38+
- "#mbox-cells"
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
#include <dt-bindings/interrupt-controller/arm-gic.h>
45+
mailbox0: mailbox@8f00000 {
46+
compatible = "st,stih407-mailbox";
47+
reg = <0x8f00000 0x1000>;
48+
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
49+
#mbox-cells = <2>;
50+
mbox-name = "a9";
51+
};
52+
53+
...

Documentation/devicetree/bindings/mailbox/sti-mailbox.txt

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/remoteproc/qcom,glink-rpm-edge.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm G-Link RPM edge
8+
9+
description: |
10+
Qualcomm G-Link edge, a FIFO based mechanism for communication with Resource
11+
Power Manager (RPM) on various Qualcomm platforms.
12+
13+
maintainers:
14+
- Bjorn Andersson <[email protected]>
15+
16+
properties:
17+
compatible:
18+
const: qcom,glink-rpm
19+
20+
label:
21+
$ref: /schemas/types.yaml#/definitions/string
22+
description:
23+
Name of the edge, used for debugging and identification purposes. The
24+
node name will be used if this is not present.
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
mboxes:
30+
items:
31+
- description: rpm_hlos mailbox in APCS
32+
33+
qcom,remote-pid:
34+
$ref: /schemas/types.yaml#/definitions/uint32
35+
description:
36+
The identifier for the remote processor as known by the rest of the
37+
system.
38+
39+
qcom,rpm-msg-ram:
40+
$ref: /schemas/types.yaml#/definitions/phandle
41+
description: |
42+
RPM message memory resource (compatible: qcom,rpm-msg-ram).
43+
44+
rpm-requests:
45+
type: object
46+
$ref: /schemas/soc/qcom/qcom,smd-rpm.yaml#
47+
unevaluatedProperties: false
48+
description:
49+
Qualcomm Resource Power Manager (RPM) over G-Link
50+
51+
properties:
52+
qcom,intents:
53+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
54+
minItems: 1
55+
maxItems: 32
56+
items:
57+
items:
58+
- description: size of each intent to preallocate
59+
- description: amount of intents to preallocate
60+
minimum: 1
61+
description:
62+
List of (size, amount) pairs describing what intents should be
63+
preallocated for this virtual channel. This can be used to tweak the
64+
default intents available for the channel to meet expectations of the
65+
remote.
66+
67+
required:
68+
- qcom,glink-channels
69+
70+
required:
71+
- compatible
72+
- interrupts
73+
- mboxes
74+
75+
anyOf:
76+
- required:
77+
- qcom,remote-pid
78+
- required:
79+
- qcom,rpm-msg-ram
80+
81+
additionalProperties: false
82+
83+
examples:
84+
- |
85+
#include <dt-bindings/interrupt-controller/arm-gic.h>
86+
87+
rpm-glink {
88+
compatible = "qcom,glink-rpm";
89+
interrupts = <GIC_SPI 168 IRQ_TYPE_EDGE_RISING>;
90+
mboxes = <&apcs_glb 0>;
91+
qcom,rpm-msg-ram = <&rpm_msg_ram>;
92+
93+
rpm-requests {
94+
compatible = "qcom,rpm-msm8996";
95+
qcom,glink-channels = "rpm_requests";
96+
97+
/* ... */
98+
};
99+
};

0 commit comments

Comments
 (0)