Merge tag 'mailbox-v6.4' of git://git.linaro.org/landing-teams/working/fujitsu/integr...

Pull mailbox updates from Jassi Brar:

 - mailbox api: allow direct registration to a channel and convert omap
   and pcc to use mbox_bind_client

 - omap and hi6220 : use of_property_read_bool

 - test: fix double-free and use spinlock header

 - rockchip and bcm-pdc: drop of_match_ptr

 - mpfs: change config symbol

 - mediatek gce: support MT6795

 - qcom apcs: consolidate of_device_id and support IPQ9574

* tag 'mailbox-v6.4' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  dt-bindings: mailbox: qcom: add compatible for IPQ9574 SoC
  mailbox: qcom-apcs-ipc: do not grow the of_device_id
  dt-bindings: mailbox: qcom,apcs-kpss-global: use fallbacks for few variants
  dt-bindings: mailbox: mediatek,gce-mailbox: Add support for MT6795
  mailbox: mpfs: convert SOC_MICROCHIP_POLARFIRE to ARCH_MICROCHIP_POLARFIRE
  mailbox: bcm-pdc: drop of_match_ptr for ID table
  mailbox: rockchip: drop of_match_ptr for ID table
  mailbox: mailbox-test: Fix potential double-free in mbox_test_message_write()
  mailbox: mailbox-test: Explicitly include header for spinlock support
  mailbox: Use of_property_read_bool() for boolean properties
  mailbox: pcc: Use mbox_bind_client
  mailbox: omap: Use mbox_bind_client
  mailbox: Allow direct registration to a channel

diff --combined Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
index 8f924bb4c5835321a33d2830c324cef0bc201567,4e15eb49e989526e190ba6bc41ed8bebd707f1f2..32d7bbc98cace83d2b4272580ab1feb5b22f40d4
--- 1/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
--- 2/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
+++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.yaml
@@@ -1,8 -1,8 +1,8 @@@
  # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
  %YAML 1.2
  ---
 -$id: "http://devicetree.org/schemas/mailbox/qcom,apcs-kpss-global.yaml#"
 -$schema: "http://devicetree.org/meta-schemas/core.yaml#"
 +$id: http://devicetree.org/schemas/mailbox/qcom,apcs-kpss-global.yaml#
 +$schema: http://devicetree.org/meta-schemas/core.yaml#
  
  title: Qualcomm APCS global block
  
@@@ -19,22 -19,15 +19,15 @@@ properties
        - items:
            - enum:
                - qcom,ipq5332-apcs-apps-global
+               - qcom,ipq8074-apcs-apps-global
+               - qcom,ipq9574-apcs-apps-global
            - const: qcom,ipq6018-apcs-apps-global
        - items:
            - enum:
-               - qcom,ipq6018-apcs-apps-global
-               - qcom,ipq8074-apcs-apps-global
-               - qcom,msm8996-apcs-hmss-global
-               - qcom,msm8998-apcs-hmss-global
-               - qcom,qcm2290-apcs-hmss-global
                - qcom,sc7180-apss-shared
                - qcom,sc8180x-apss-shared
-               - qcom,sdm660-apcs-hmss-global
-               - qcom,sdm845-apss-shared
-               - qcom,sm4250-apcs-hmss-global
-               - qcom,sm6125-apcs-hmss-global
-               - qcom,sm6115-apcs-hmss-global
                - qcom,sm8150-apss-shared
+           - const: qcom,sdm845-apss-shared
        - items:
            - enum:
                - qcom,msm8916-apcs-kpss-global
@@@ -45,6 -38,18 +38,18 @@@
                - qcom,qcs404-apcs-apps-global
                - qcom,sdx55-apcs-gcc
            - const: syscon
+       - enum:
+           - qcom,ipq6018-apcs-apps-global
+           - qcom,ipq8074-apcs-apps-global
+           - qcom,msm8996-apcs-hmss-global
+           - qcom,msm8998-apcs-hmss-global
+           - qcom,qcm2290-apcs-hmss-global
+           - qcom,sdm660-apcs-hmss-global
+           - qcom,sdm845-apss-shared
+           - qcom,sm4250-apcs-hmss-global
+           - qcom,sm6115-apcs-hmss-global
+           - qcom,sm6125-apcs-hmss-global
+ 
    reg:
      maxItems: 1
  
@@@ -88,31 -93,30 +93,31 @@@ allOf
            items:
              - const: pll
              - const: aux
+ 
    - if:
        properties:
          compatible:
 -          enum:
 -            - qcom,sdx55-apcs-gcc
 +          contains:
 +            enum:
 +              - qcom,sdx55-apcs-gcc
      then:
        properties:
          clocks:
            items:
 +            - description: reference clock
              - description: primary pll parent of the clock driver
              - description: auxiliary parent
 -            - description: reference clock
          clock-names:
            items:
 +            - const: ref
              - const: pll
              - const: aux
 -            - const: ref
    - if:
        properties:
          compatible:
            contains:
              enum:
                - qcom,ipq6018-apcs-apps-global
-               - qcom,ipq8074-apcs-apps-global
      then:
        properties:
          clocks:
@@@ -134,14 -138,11 +139,11 @@@
              - qcom,msm8996-apcs-hmss-global
              - qcom,msm8998-apcs-hmss-global
              - qcom,qcm2290-apcs-hmss-global
-             - qcom,sc7180-apss-shared
-             - qcom,sc8180x-apss-shared
              - qcom,sdm660-apcs-hmss-global
              - qcom,sdm845-apss-shared
              - qcom,sm4250-apcs-hmss-global
              - qcom,sm6115-apcs-hmss-global
              - qcom,sm6125-apcs-hmss-global
-             - qcom,sm8150-apss-shared
      then:
        properties:
          clocks: false
@@@ -153,7 -154,6 +155,6 @@@
            contains:
              enum:
                - qcom,ipq6018-apcs-apps-global
-               - qcom,ipq8074-apcs-apps-global
      then:
        properties:
          '#clock-cells':

diff --combined drivers/mailbox/Kconfig
index af6b0f5b491ddc2b0102ac4424ade9f7502db840,3f97d5535267f3b447d282fd3f13eca8a69d2478..bc2e265cb02d2aa5ec984d019099423b43d986de
--- 1/drivers/mailbox/Kconfig
--- 2/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@@ -176,7 -176,7 +176,7 @@@ config MAILBOX_TES
  config POLARFIRE_SOC_MAILBOX
        tristate "PolarFire SoC (MPFS) Mailbox"
        depends on HAS_IOMEM
-       depends on SOC_MICROCHIP_POLARFIRE || COMPILE_TEST
+       depends on ARCH_MICROCHIP_POLARFIRE || COMPILE_TEST
        help
          This driver adds support for the PolarFire SoC (MPFS) mailbox controller.
  
@@@ -259,7 -259,7 +259,7 @@@ config MTK_CMDQ_MBO
          during the vblank.
  
  config ZYNQMP_IPI_MBOX
 -      bool "Xilinx ZynqMP IPI Mailbox"
 +      tristate "Xilinx ZynqMP IPI Mailbox"
        depends on ARCH_ZYNQMP && OF
        help
          Say yes here to add support for Xilinx IPI mailbox driver.

diff --combined drivers/mailbox/rockchip-mailbox.c
index 28d7bfee26417e68b5bde745b31f09a0a1b8074d,5a4934d39ad6b101a6ab20d96ef516fa48cd3213..116286ecc5a0c6181a0270350cfab37b2e1b3b1f
--- 1/drivers/mailbox/rockchip-mailbox.c
--- 2/drivers/mailbox/rockchip-mailbox.c
+++ b/drivers/mailbox/rockchip-mailbox.c
@@@ -248,12 -248,13 +248,12 @@@ static struct platform_driver rockchip_
        .probe  = rockchip_mbox_probe,
        .driver = {
                .name = "rockchip-mailbox",
-               .of_match_table = of_match_ptr(rockchip_mbox_of_match),
+               .of_match_table = rockchip_mbox_of_match,
        },
  };
  
  module_platform_driver(rockchip_mbox_driver);
  
 -MODULE_LICENSE("GPL v2");
  MODULE_DESCRIPTION("Rockchip mailbox: communicate between CPU cores and MCU");
  MODULE_AUTHOR("Addy Ke <[email protected]>");
  MODULE_AUTHOR("Caesar Wang <[email protected]>");