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

Merge tag 'mailbox-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox 

Pull mailbox updates from Jassi Brar:

 - fix kconfig dependencies (mhu-v3, omap2+)

 - use devie name instead of genereic imx_mu_chan as interrupt name
   (imx)

 - enable sa8255p and qcs8300 ipc controllers (qcom)

 - Fix timeout during suspend mode (bcm2835)

 - convert to use use of_property_match_string (mailbox)

 - enable mt8188 (mediatek)

 - use devm_clk_get_enabled helpers (spreadtrum)

 - fix device-id typo (rockchip)

* tag 'mailbox-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox:
  mailbox, remoteproc: omap2+: fix compile testing
  dt-bindings: mailbox: qcom-ipcc: Document QCS8300 IPCC
  dt-bindings: mailbox: qcom-ipcc: document the support for SA8255p
  dt-bindings: mailbox: mtk,adsp-mbox: Add compatible for MT8188
  mailbox: Use of_property_match_string() instead of open-coding
  mailbox: bcm2835: Fix timeout during suspend mode
  mailbox: sprd: Use devm_clk_get_enabled() helpers
  mailbox: rockchip: fix a typo in module autoloading
  mailbox: imx: use device name in interrupt name
  mailbox: ARM_MHU_V3 should depend on ARM64
parents 907537f5 54595f28

Documentation/devicetree/bindings/mailbox/mtk,adsp-mbox.yaml

+9 −3
Original line number Diff line number Diff line
@@ -17,9 +17,15 @@ description: | 


properties:

  compatible:

    enum:

      - mediatek,mt8195-adsp-mbox

    oneOf:

      - enum:

          - mediatek,mt8186-adsp-mbox

          - mediatek,mt8195-adsp-mbox

      - items:

          - enum:

              - mediatek,mt8188-adsp-mbox

          - const: mediatek,mt8186-adsp-mbox





  "#mbox-cells":

    const: 0

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

+2 −0
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ properties: 
  compatible:

    items:

      - enum:

          - qcom,qcs8300-ipcc

          - qcom,qdu1000-ipcc

          - qcom,sa8255p-ipcc

          - qcom,sa8775p-ipcc

          - qcom,sc7280-ipcc

          - qcom,sc8280xp-ipcc

drivers/mailbox/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ config ARM_MHU_V2 


config ARM_MHU_V3

	tristate "ARM MHUv3 Mailbox"

	depends on ARM64 || COMPILE_TEST

	depends on HAS_IOMEM || COMPILE_TEST

	depends on OF

	help
@@ -73,7 +74,7 @@ config ARMADA_37XX_RWTM_MBOX 


config OMAP2PLUS_MBOX

	tristate "OMAP2+ Mailbox framework support"

	depends on ARCH_OMAP2PLUS || ARCH_K3

	depends on ARCH_OMAP2PLUS || ARCH_K3 || COMPILE_TEST

	help

	  Mailbox implementation for OMAP family chips with hardware for

	  interprocessor communication involving DSP, IVA1.0 and IVA2 in

drivers/mailbox/bcm2835-mailbox.c

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ static int bcm2835_mbox_probe(struct platform_device *pdev) 
	spin_lock_init(&mbox->lock);



	ret = devm_request_irq(dev, irq_of_parse_and_map(dev->of_node, 0),

			       bcm2835_mbox_irq, 0, dev_name(dev), mbox);

			       bcm2835_mbox_irq, IRQF_NO_SUSPEND, dev_name(dev),

			       mbox);

	if (ret) {

		dev_err(dev, "Failed to register a mailbox IRQ handler: %d\n",

			ret);

drivers/mailbox/imx-mailbox.c

+3 −3
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#define IMX_MU_SCU_CHANS	6

/* TX0/RX0 */

#define IMX_MU_S4_CHANS		2

#define IMX_MU_CHAN_NAME_SIZE	20

#define IMX_MU_CHAN_NAME_SIZE	32



#define IMX_MU_V2_PAR_OFF	0x4

#define IMX_MU_V2_TR_MASK	GENMASK(7, 0)
@@ -782,7 +782,7 @@ static int imx_mu_init_generic(struct imx_mu_priv *priv) 
		cp->chan = &priv->mbox_chans[i];

		priv->mbox_chans[i].con_priv = cp;

		snprintf(cp->irq_desc, sizeof(cp->irq_desc),

			 "imx_mu_chan[%i-%i]", cp->type, cp->idx);

			 "%s[%i-%i]", dev_name(priv->dev), cp->type, cp->idx);

	}



	priv->mbox.num_chans = IMX_MU_CHANS;
@@ -819,7 +819,7 @@ static int imx_mu_init_specific(struct imx_mu_priv *priv) 
		cp->chan = &priv->mbox_chans[i];

		priv->mbox_chans[i].con_priv = cp;

		snprintf(cp->irq_desc, sizeof(cp->irq_desc),

			 "imx_mu_chan[%i-%i]", cp->type, cp->idx);

			 "%s[%i-%i]", dev_name(priv->dev), cp->type, cp->idx);

	}



	priv->mbox.num_chans = num_chans;