Merge tag 'mailbox-v4.20' of git://git.linaro.org/landing-teams/working/fujitsu/integ...

Pull mailbox updates from Jassi Brar:

 - convert print users to use the %pOFn format specifier

 - enable ti-msgmr driver for the K3 platform as well

 - add QCS404 to compatible list of QCOM's APCS IPC driver

 - minor spelling fixes toogle -> toggle

 - kzalloc failure catch in Mediatek driver

* tag 'mailbox-v4.20' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  mailbox: mediatek: Add check for possible failure of kzalloc
  mailbox: bcm-flexrm-mailbox: fix spelling mistake "toogle" -> "toggle"
  mailbox: qcom: Add QCS404 APPS Global compatible
  drivers: mailbox: Make ti-msgmr driver depend on ARCH_K3
  mailbox: Convert to using %pOFn instead of device_node.name

diff --git a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt
index 6e8a9ab0fdaebb9919168b2923c45c88cdc8c197..1232fc9fc709c6dafddf00518e48f599a6927e9f 100644 (file)
--- a/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt
+++ b/Documentation/devicetree/bindings/mailbox/qcom,apcs-kpss-global.txt
@@ -11,6 +11,7 @@ platforms.
                    "qcom,msm8916-apcs-kpss-global",
                    "qcom,msm8996-apcs-hmss-global"
                    "qcom,msm8998-apcs-hmss-global"
+                   "qcom,qcs404-apcs-apps-global"
                    "qcom,sdm845-apss-shared"
 
 - reg:

diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig
index 841c005d8ebb2f720047a984ff25c0d974a37dff..3eeb12e93e986fd009818182a6a813645c14b5d9 100644 (file)
--- a/drivers/mailbox/Kconfig
+++ b/drivers/mailbox/Kconfig
@@ -105,12 +105,12 @@ config STI_MBOX
 
 config TI_MESSAGE_MANAGER
        tristate "Texas Instruments Message Manager Driver"
-       depends on ARCH_KEYSTONE
+       depends on ARCH_KEYSTONE || ARCH_K3
        help
          An implementation of Message Manager slave driver for Keystone
-         architecture SoCs from Texas Instruments. Message Manager is a
-         communication entity found on few of Texas Instrument's keystone
-         architecture SoCs. These may be used for communication between
+         and K3 architecture SoCs from Texas Instruments. Message Manager
+         is a communication entity found on few of Texas Instrument's keystone
+         and K3 architecture SoCs. These may be used for communication between
          multiple processors within the SoC. Select this driver if your
          platform has support for the hardware block.
 

diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c
index 8ab077ff58f4a8a58cebf7a8d3aa1a93417b088e..d7a8ed7d809789f6d55f28aa7935d026193b0db7 100644 (file)
--- a/drivers/mailbox/bcm-flexrm-mailbox.c
+++ b/drivers/mailbox/bcm-flexrm-mailbox.c
@@ -375,7 +375,7 @@ static u32 flexrm_estimate_header_desc_count(u32 nhcnt)
        return hcnt;
 }
 
-static void flexrm_flip_header_toogle(void *desc_ptr)
+static void flexrm_flip_header_toggle(void *desc_ptr)
 {
        u64 desc = flexrm_read_desc(desc_ptr);
 
@@ -709,7 +709,7 @@ static void *flexrm_spu_write_descs(struct brcm_message *msg, u32 nhcnt,
        wmb();
 
        /* Flip toggle bit in header */
-       flexrm_flip_header_toogle(orig_desc_ptr);
+       flexrm_flip_header_toggle(orig_desc_ptr);
 
        return desc_ptr;
 }
@@ -838,7 +838,7 @@ static void *flexrm_sba_write_descs(struct brcm_message *msg, u32 nhcnt,
        wmb();
 
        /* Flip toggle bit in header */
-       flexrm_flip_header_toogle(orig_desc_ptr);
+       flexrm_flip_header_toggle(orig_desc_ptr);
 
        return desc_ptr;
 }

diff --git a/drivers/mailbox/mtk-cmdq-mailbox.c b/drivers/mailbox/mtk-cmdq-mailbox.c
index aec46d5d3506181a7dc34bee920d80645c2c95f0..f7cc29c00302a493ee4136fe41273775b706c35a 100644 (file)
--- a/drivers/mailbox/mtk-cmdq-mailbox.c
+++ b/drivers/mailbox/mtk-cmdq-mailbox.c
@@ -363,6 +363,9 @@ static int cmdq_mbox_send_data(struct mbox_chan *chan, void *data)
        WARN_ON(cmdq->suspended);
 
        task = kzalloc(sizeof(*task), GFP_ATOMIC);
+       if (!task)
+               return -ENOMEM;
+
        task->cmdq = cmdq;
        INIT_LIST_HEAD(&task->list_entry);
        task->pa_base = pkt->pa_base;

diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
index 333ed4a9d4b8fc62d14fdc9abc8db0242a80026c..aed23ac9550dff8ef24761a18776ca650d082c7a 100644 (file)
--- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c
+++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c
@@ -126,6 +126,7 @@ static const struct of_device_id qcom_apcs_ipc_of_match[] = {
        { .compatible = "qcom,msm8916-apcs-kpss-global", .data = (void *)8 },
        { .compatible = "qcom,msm8996-apcs-hmss-global", .data = (void *)16 },
        { .compatible = "qcom,msm8998-apcs-hmss-global", .data = (void *)8 },
+       { .compatible = "qcom,qcs404-apcs-apps-global", .data = (void *)8 },
        { .compatible = "qcom,sdm845-apss-shared", .data = (void *)12 },
        {}
 };

diff --git a/drivers/mailbox/ti-msgmgr.c b/drivers/mailbox/ti-msgmgr.c
index 5bceafbf66993f266de4df2ddf574c9c19bfdca9..713d701b656892d2f9fe5d7008f30808d21936c8 100644 (file)
--- a/drivers/mailbox/ti-msgmgr.c
+++ b/drivers/mailbox/ti-msgmgr.c
@@ -560,8 +560,8 @@ static struct mbox_chan *ti_msgmgr_of_xlate(struct mbox_controller *mbox,
        }
 
 err:
-       dev_err(inst->dev, "Queue ID %d, Proxy ID %d is wrong on %s\n",
-               req_qid, req_pid, p->np->name);
+       dev_err(inst->dev, "Queue ID %d, Proxy ID %d is wrong on %pOFn\n",
+               req_qid, req_pid, p->np);
        return ERR_PTR(-ENOENT);
 }