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

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

Pull mailbox updates from Jassi Brar:

 - qcom: misc updates to qcom-ipcc driver

 - mpfs: change compatible string

 - pcc:
     - fix handling of subtypes
     - avoid uninitialized variable

 - mtk:
     - add missing of_node_put
     - enable control_by_sw
     - silent probe-defer prints
     - fix gce_num for mt8192

 - zynq: add missing of_node_put

 - imx: check for NULL instead of IS_ERR

 - appple: switch to generic compatibles

 - hi3660: convert comments to kernel-doc notation

* tag 'mailbox-v5.17' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  dt-bindings: mailbox: Add more protocol and client ID
  mailbox: qcom-ipcc: Support interrupt wake up from suspend
  mailbox: qcom-ipcc: Support more IPCC instance
  mailbox: qcom-ipcc: Dynamic alloc for channel arrangement
  mailbox: change mailbox-mpfs compatible string
  mailbox: pcc: Handle all PCC subtypes correctly in pcc_mbox_irq
  mailbox: pcc: Avoid using the uninitialized variable 'dev'
  mailbox: mtk: add missing of_node_put before return
  mailbox: zynq: add missing of_node_put before return
  mailbox: imx: Fix an IS_ERR() vs NULL bug
  mailbox: hi3660: convert struct comments to kernel-doc notation
  mailbox: add control_by_sw for mt8195
  mailbox: mtk-cmdq: Silent EPROBE_DEFER errors for clks
  mailbox: fix gce_num of mt8192 driver data
  mailbox: apple: Bind to generic compatibles
  dt-bindings: mailbox: apple,mailbox: Add generic and t6000 compatibles
parents 747c19eb 869b6ca3

Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml

+9 −3
Original line number Diff line number Diff line
@@ -27,14 +27,20 @@ properties: 
          for example for the display controller, the system management

          controller and the NVMe coprocessor.

        items:

          - const: apple,t8103-asc-mailbox

          - enum:

              - apple,t8103-asc-mailbox

              - apple,t6000-asc-mailbox

          - const: apple,asc-mailbox-v4



      - description:

          M3 mailboxes are an older variant with a slightly different MMIO

          interface still found on the M1. It is used for the Thunderbolt

          co-processors.

        items:

          - const: apple,t8103-m3-mailbox

          - enum:

              - apple,t8103-m3-mailbox

              - apple,t6000-m3-mailbox

          - const: apple,m3-mailbox-v2



  reg:

    maxItems: 1
@@ -71,7 +77,7 @@ additionalProperties: false 
examples:

  - |

        mailbox@77408000 {

                compatible = "apple,t8103-asc-mailbox";

                compatible = "apple,t8103-asc-mailbox", "apple,asc-mailbox-v4";

                reg = <0x77408000 0x4000>;

                interrupts = <1 583 4>, <1 584 4>, <1 585 4>, <1 586 4>;

                interrupt-names = "send-empty", "send-not-empty",

drivers/mailbox/apple-mailbox.c

+2 −2
Original line number Diff line number Diff line
@@ -364,8 +364,8 @@ static const struct apple_mbox_hw apple_mbox_m3_hw = { 
};



static const struct of_device_id apple_mbox_of_match[] = {

	{ .compatible = "apple,t8103-asc-mailbox", .data = &apple_mbox_asc_hw },

	{ .compatible = "apple,t8103-m3-mailbox", .data = &apple_mbox_m3_hw },

	{ .compatible = "apple,asc-mailbox-v4", .data = &apple_mbox_asc_hw },

	{ .compatible = "apple,m3-mailbox-v2", .data = &apple_mbox_m3_hw },

	{}

};

MODULE_DEVICE_TABLE(of, apple_mbox_of_match);

drivers/mailbox/hi3660-mailbox.c

+8 −10
Original line number Diff line number Diff line
@@ -44,14 +44,13 @@ 
#define MBOX_MSG_LEN			8



/**

 * Hi3660 mailbox channel information

 * struct hi3660_chan_info - Hi3660 mailbox channel information

 * @dst_irq:	Interrupt vector for remote processor

 * @ack_irq:	Interrupt vector for local processor

 *

 * A channel can be used for TX or RX, it can trigger remote

 * processor interrupt to notify remote processor and can receive

 * interrupt if has incoming message.

 *

 * @dst_irq:	Interrupt vector for remote processor

 * @ack_irq:	Interrupt vector for local processor

 * interrupt if it has an incoming message.

 */

struct hi3660_chan_info {

	unsigned int dst_irq;
@@ -59,16 +58,15 @@ struct hi3660_chan_info { 
};



/**

 * Hi3660 mailbox controller data

 *

 * Mailbox controller includes 32 channels and can allocate

 * channel for message transferring.

 *

 * struct hi3660_mbox - Hi3660 mailbox controller data

 * @dev:	Device to which it is attached

 * @base:	Base address of the register mapping region

 * @chan:	Representation of channels in mailbox controller

 * @mchan:	Representation of channel info

 * @controller:	Representation of a communication channel controller

 *

 * Mailbox controller includes 32 channels and can allocate

 * channel for message transferring.

 */

struct hi3660_mbox {

	struct device *dev;

drivers/mailbox/imx-mailbox.c

+2 −2
Original line number Diff line number Diff line
@@ -563,8 +563,8 @@ static int imx_mu_probe(struct platform_device *pdev) 
		size = sizeof(struct imx_sc_rpc_msg_max);



	priv->msg = devm_kzalloc(dev, size, GFP_KERNEL);

	if (IS_ERR(priv->msg))

		return PTR_ERR(priv->msg);

	if (!priv->msg)

		return -ENOMEM;



	priv->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(priv->clk)) {

drivers/mailbox/mailbox-mpfs.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static int mpfs_mbox_probe(struct platform_device *pdev) 
}



static const struct of_device_id mpfs_mbox_of_match[] = {

	{.compatible = "microchip,polarfire-soc-mailbox", },

	{.compatible = "microchip,mpfs-mailbox", },

	{},

};

MODULE_DEVICE_TABLE(of, mpfs_mbox_of_match);