diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-20 12:58:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-20 12:58:32 -0700 |
| commit | 2b2f72d8ce59acce95ceb156f0f31b848e32e6d4 (patch) | |
| tree | 7a2699c4d9fb5fbab29d61be67ee08cd9091bcaf /Documentation/devicetree/bindings/mailbox/sti-mailbox.txt | |
| parent | Merge tag 'xtensa-next-20160320' of git://github.com/czankel/xtensa-linux (diff) | |
| parent | mailbox: rockchip: avoid 64-bit division (diff) | |
| download | linux-dev-2b2f72d8ce59acce95ceb156f0f31b848e32e6d4.tar.xz linux-dev-2b2f72d8ce59acce95ceb156f0f31b848e32e6d4.zip | |
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- mailbox bindings and drivers for
* APM X-Gene
* Hisilicon Hi6220
* Rockchip RK3368
platforms
- minor fixes to the above three drivers.
- misc cleanups of mailbox-test driver.
* 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
mailbox: rockchip: avoid 64-bit division
mailbox: rockchip: Add Rockchip mailbox driver
dt-bindings: rockchip-mailbox: Add mailbox controller document on Rockchip SoCs
mailbox/xgene-slimpro: Checking for IS_ERR instead of NULL
mailbox: Hi6220: add mailbox driver
dt-bindings: mailbox: Document Hi6220 mailbox driver
mailbox: mailbox-test: add support for separate tx/rx buffer with single channel
mailbox: mailbox-test: use print_hex_dump_bytes to allow dynamic printk
mailbox: mailbox-test: fix the compatible string
mailbox: mailbox-test: rename driver as generic test driver
Documentation: mailbox: Add APM X-Gene SLIMpro mailbox dts documentation
mailbox: Add support for APM X-Gene platform mailbox driver
Diffstat (limited to 'Documentation/devicetree/bindings/mailbox/sti-mailbox.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/mailbox/sti-mailbox.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt b/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt index b61eec920359..351f612673fc 100644 --- a/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt +++ b/Documentation/devicetree/bindings/mailbox/sti-mailbox.txt @@ -44,7 +44,7 @@ Optional properties Example: mailbox_test { - compatible = "mailbox_test"; + compatible = "mailbox-test"; reg = <0x[shared_memory_address], [shared_memory_size]>; mboxes = <&mailbox2 0 1>, <&mailbox0 2 1>; mbox-names = "tx", "rx"; |