From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 Sep 2021 21:12:24 +0000 (-0700)
Subject: Merge tag 'mailbox-v5.15' of git://git.linaro.org/landing-teams/working/fujitsu/integ... 
X-Git-Tag: microblaze-v5.16~114
X-Git-Url: http://git.monstr.eu/?p=linux-2.6-microblaze.git;a=commitdiff_plain;h=a180eab0b564a9dc149beb0517136ef7129f1260

Merge tag 'mailbox-v5.15' of git://git.linaro.org/landing-teams/working/fujitsu/integration

Pull mailbox updates from Jassi Brar:

 - mtk:
     - added support for mt8192 and mt8195
     - minor fix regarding address shift

 - qcom:
     - added compatibles for MSM8953, SM6350 and SM6115
     - enable loading IPCC as a module

 - misc:
     - change Altera maintainer
     - fix sti kernel-doc warnings

* tag 'mailbox-v5.15' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  mailbox: cmdq: add multi-gce clocks support for mt8195
  mailbox: cmdq: add mediatek mailbox support for mt8195
  dt-bindings: gce: add gce header file for mt8195
  dt-bindings: mailbox: add definition for mt8195
  mailbox: qcom-apcs-ipc: Add compatible for MSM8953 SoC
  dt-bindings: mailbox: Add compatible for the MSM8953
  dt-bindings: mailbox: qcom-ipcc: Add compatible for SM6350
  mailbox: qcom: Add support for SM6115 APCS IPC
  dt-bindings: mailbox: qcom: Add SM6115 APCS compatible
  soc: mediatek: cmdq: add address shift in jump
  mailbox: cmdq: add mt8192 support
  dt-binding: gce: add gce header file for mt8192
  MAINTAINERS: Replace Ley Foon Tan as Altera Mailbox maintainer
  mailbox: qcom-ipcc: Enable loading QCOM_IPCC as a module
  mailbox: sti: quieten kernel-doc warnings
---

a180eab0b564a9dc149beb0517136ef7129f1260
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: