From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 2 Sep 2021 01:44:23 +0000 (+1000)
Subject: Merge remote-tracking branch 'mailbox/mailbox-for-next'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ec9f06550b0e18f5cb7714af9e9136945fbf2766;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'mailbox/mailbox-for-next'
---

ec9f06550b0e18f5cb7714af9e9136945fbf2766
diff --cc Documentation/devicetree/bindings/mailbox/mtk-gce.txt
index 2ef7ff67cb2b,8e81916556a3..89a59b9c81f9
--- a/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
+++ b/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
@@@ -35,13 -35,10 +35,14 @@@ Optional properties for a client device
    start_offset: the start offset of register address that GCE can access.
    size: the total size of register address that GCE can access.
  
 +Optional properties for a client mutex node:
 +- mediatek,gce-events: GCE events used by clients. The event numbers are
 +  defined in 'dt-bindings/gce/<chip>-gce.h'.
 +
  Some vaules of properties are defined in 'dt-bindings/gce/mt8173-gce.h',
- 'dt-binding/gce/mt8183-gce.h' or 'dt-bindings/gce/mt6779-gce.h'. Such as
- sub-system ids, thread priority, event ids.
+ 'dt-binding/gce/mt8183-gce.h', 'dt-binding/gce/mt8192-gce.h',
+ 'dt-binding/gce/mt8195-gce.h' or 'dt-bindings/gce/mt6779-gce.h'.
+ Such as sub-system ids, thread priority, event ids.
  
  Example: