diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-13 11:19:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-13 11:19:07 -0800 |
| commit | fb3b0673b7d5b477ed104949450cd511337ba3c6 (patch) | |
| tree | 3057ae8aa7f1ccd23095860b56b45f6b57bd9ccb /Documentation | |
| parent | Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma (diff) | |
| parent | dt-bindings: mailbox: Add more protocol and client ID (diff) | |
| download | linux-dev-fb3b0673b7d5b477ed104949450cd511337ba3c6.tar.xz linux-dev-fb3b0673b7d5b477ed104949450cd511337ba3c6.zip | |
Merge tag 'mailbox-v5.17' of git://git.linaro.org/landing-teams/working/fujitsu/integration
Pull mailbox updates from Jassi Brar:
- qcom: misc updates to qcom-ipcc driver
- mpfs: change compatible string
- pcc:
- fix handling of subtypes
- avoid uninitialized variable
- mtk:
- add missing of_node_put
- enable control_by_sw
- silent probe-defer prints
- fix gce_num for mt8192
- zynq: add missing of_node_put
- imx: check for NULL instead of IS_ERR
- appple: switch to generic compatibles
- hi3660: convert comments to kernel-doc notation
* tag 'mailbox-v5.17' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
dt-bindings: mailbox: Add more protocol and client ID
mailbox: qcom-ipcc: Support interrupt wake up from suspend
mailbox: qcom-ipcc: Support more IPCC instance
mailbox: qcom-ipcc: Dynamic alloc for channel arrangement
mailbox: change mailbox-mpfs compatible string
mailbox: pcc: Handle all PCC subtypes correctly in pcc_mbox_irq
mailbox: pcc: Avoid using the uninitialized variable 'dev'
mailbox: mtk: add missing of_node_put before return
mailbox: zynq: add missing of_node_put before return
mailbox: imx: Fix an IS_ERR() vs NULL bug
mailbox: hi3660: convert struct comments to kernel-doc notation
mailbox: add control_by_sw for mt8195
mailbox: mtk-cmdq: Silent EPROBE_DEFER errors for clks
mailbox: fix gce_num of mt8192 driver data
mailbox: apple: Bind to generic compatibles
dt-bindings: mailbox: apple,mailbox: Add generic and t6000 compatibles
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml index c4255f42e801..5c5c328b3134 100644 --- a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml +++ b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml @@ -27,14 +27,20 @@ properties: for example for the display controller, the system management controller and the NVMe coprocessor. items: - - const: apple,t8103-asc-mailbox + - enum: + - apple,t8103-asc-mailbox + - apple,t6000-asc-mailbox + - const: apple,asc-mailbox-v4 - description: M3 mailboxes are an older variant with a slightly different MMIO interface still found on the M1. It is used for the Thunderbolt co-processors. items: - - const: apple,t8103-m3-mailbox + - enum: + - apple,t8103-m3-mailbox + - apple,t6000-m3-mailbox + - const: apple,m3-mailbox-v2 reg: maxItems: 1 @@ -71,7 +77,7 @@ additionalProperties: false examples: - | mailbox@77408000 { - compatible = "apple,t8103-asc-mailbox"; + compatible = "apple,t8103-asc-mailbox", "apple,asc-mailbox-v4"; reg = <0x77408000 0x4000>; interrupts = <1 583 4>, <1 584 4>, <1 585 4>, <1 586 4>; interrupt-names = "send-empty", "send-not-empty", |