mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-12 19:44:51 -04:00
Merge tag 'mailbox-v4.20' of git://git.linaro.org/landing-teams/working/fujitsu/integration
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
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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 },
|
||||
{}
|
||||
};
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user