aboutsummaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-08-21 22:19:41 -0500
committerMark Brown <broonie@linaro.org>2014-08-21 22:19:41 -0500
commit5fa06ef3905aa942f0ed558d4450ba140a056c8f (patch)
tree32ce3128572ac26eeb50d4af44625fb77cc201ff /Documentation/devicetree/bindings
parent2d9add24705f046799859d60fb0d0b5a8eb78073 (diff)
parentdb627fe0d7a4cc89176244747eb56542ccf95fd7 (diff)
downloadlinux-linaro-stable-5fa06ef3905aa942f0ed558d4450ba140a056c8f.tar.gz
Merge remote-tracking branch 'lsk/v3.14/topic/mailbox' into linux-linaro-lsk-v3.14
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r--Documentation/devicetree/bindings/mailbox/mailbox.txt11
1 files changed, 8 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/mailbox/mailbox.txt b/Documentation/devicetree/bindings/mailbox/mailbox.txt
index 3f009555f392..1a2cd3d266db 100644
--- a/Documentation/devicetree/bindings/mailbox/mailbox.txt
+++ b/Documentation/devicetree/bindings/mailbox/mailbox.txt
@@ -19,15 +19,20 @@ Example:
* Mailbox Client
Required property:
-- mbox: List of phandle and mailbox channel specifier.
+- mboxes: List of phandle and mailbox channel specifiers.
+Optional property:
- mbox-names: List of identifier strings for each mailbox channel
- required by the client.
+ required by the client. The use of this property
+ is discouraged in favor of using index in list of
+ 'mboxes' while requesting a mailbox. Instead the
+ platforms may define channel indices, in DT headers,
+ to something legible.
Example:
pwr_cntrl: power {
...
mbox-names = "pwr-ctrl", "rpc";
- mbox = <&mailbox 0
+ mboxes = <&mailbox 0
&mailbox 1>;
};