Commit a180eab0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 7ba88a2a 85dfdbfc

Documentation/devicetree/bindings/mailbox/mtk-gce.txt

+5 −4
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ CMDQ driver uses mailbox framework for communication. Please refer to 
mailbox.txt for generic information about mailbox device-tree bindings.



Required properties:

- compatible: can be "mediatek,mt8173-gce", "mediatek,mt8183-gce" or

  "mediatek,mt6779-gce".

- compatible: can be "mediatek,mt8173-gce", "mediatek,mt8183-gce",

  "mediatek,mt8192-gce", "mediatek,mt8195-gce" or "mediatek,mt6779-gce".

- reg: Address range of the GCE unit

- interrupts: The interrupt signal from the GCE block

- clock: Clocks according to the common clock binding
@@ -40,8 +40,9 @@ Optional properties for a client mutex node: 
  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:

Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
      - qcom,ipq8074-apcs-apps-global

      - qcom,msm8916-apcs-kpss-global

      - qcom,msm8939-apcs-kpss-global

      - qcom,msm8953-apcs-kpss-global

      - qcom,msm8994-apcs-kpss-global

      - qcom,msm8996-apcs-hmss-global

      - qcom,msm8998-apcs-hmss-global
@@ -29,6 +30,7 @@ properties: 
      - qcom,sdm660-apcs-hmss-global

      - qcom,sdm845-apss-shared

      - qcom,sm6125-apcs-hmss-global

      - qcom,sm6115-apcs-hmss-global

      - qcom,sm8150-apss-shared



  reg:

Documentation/devicetree/bindings/mailbox/qcom-ipcc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
  compatible:

    items:

      - enum:

          - qcom,sm6350-ipcc

          - qcom,sm8250-ipcc

          - qcom,sm8350-ipcc

          - qcom,sc7280-ipcc

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -798,7 +798,7 @@ F: Documentation/devicetree/bindings/i2c/i2c-altera.txt 
F:	drivers/i2c/busses/i2c-altera.c









ALTERA MAILBOX DRIVER









M:	Ley Foon Tan <ley.foon.tan@intel.com>









M:	Joyce Ooi <joyce.ooi@intel.com>









S:	Maintained









F:	drivers/mailbox/mailbox-altera.c








































drivers/mailbox/Kconfig



+1
−1






























Original line number
Diff line number
Diff line







@@ -264,7 +264,7 @@ config SPRD_MBOX







	  you want to build the Spreatrum mailbox controller driver.



















config QCOM_IPCC









	bool "Qualcomm Technologies, Inc. IPCC driver"









	tristate "Qualcomm Technologies, Inc. IPCC driver"









	depends on ARCH_QCOM || COMPILE_TEST









	help









	  Qualcomm Technologies, Inc. Inter-Processor Communication Controller