Commit 1c1094e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 03e5cb7b d396133d

Documentation/devicetree/bindings/mailbox/mediatek,gce-mailbox.yaml

+12 −8
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ description: 


properties:

  compatible:

    enum:

    oneOf:

      - enum:

          - mediatek,mt6779-gce

          - mediatek,mt8173-gce

          - mediatek,mt8183-gce
@@ -24,6 +25,9 @@ properties: 
          - mediatek,mt8188-gce

          - mediatek,mt8192-gce

          - mediatek,mt8195-gce

      - items:

          - const: mediatek,mt6795-gce

          - const: mediatek,mt8173-gce



  "#mbox-cells":

    const: 2

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

+16 −15
Original line number Diff line number Diff line
@@ -19,22 +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 @@ properties: 
              - 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,6 +93,7 @@ allOf: 
          items:

            - const: pll

            - const: aux



  - if:

      properties:

        compatible:
@@ -112,7 +118,6 @@ allOf: 
          contains:

            enum:

              - qcom,ipq6018-apcs-apps-global

              - qcom,ipq8074-apcs-apps-global

    then:

      properties:

        clocks:
@@ -134,14 +139,11 @@ allOf: 
            - 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 +155,6 @@ allOf: 
          contains:

            enum:

              - qcom,ipq6018-apcs-apps-global

              - qcom,ipq8074-apcs-apps-global

    then:

      properties:

        '#clock-cells':

drivers/mailbox/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ config MAILBOX_TEST 
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.

drivers/mailbox/bcm-pdc-mailbox.c

+1 −1
Original line number Diff line number Diff line
@@ -1635,7 +1635,7 @@ static struct platform_driver pdc_mbox_driver = { 
	.remove = pdc_remove,

	.driver = {

		   .name = "brcm-iproc-pdc-mbox",

		   .of_match_table = of_match_ptr(pdc_mbox_of_match),

		   .of_match_table = pdc_mbox_of_match,

		   },

};

module_platform_driver(pdc_mbox_driver);

drivers/mailbox/hi6220-mailbox.c

+1 −4
Original line number Diff line number Diff line
@@ -325,10 +325,7 @@ static int hi6220_mbox_probe(struct platform_device *pdev) 
	writel(~0x0, ACK_INT_CLR_REG(mbox->ipc));



	/* use interrupt for tx's ack */

	if (of_find_property(node, "hi6220,mbox-tx-noirq", NULL))

		mbox->tx_irq_mode = false;

	else

		mbox->tx_irq_mode = true;

	mbox->tx_irq_mode = !of_property_read_bool(node, "hi6220,mbox-tx-noirq");



	if (mbox->tx_irq_mode)

		mbox->controller.txdone_irq = true;