[PATCH 2/3] remoteproc: k3-r5: Fix usage of omap_mbox_message and mbox_msg_t

[Andrew Davis]

The type of message sent using omap-mailbox is always u32. The definition
of mbox_msg_t is uintptr_t which is wrong as that type changes based on
the architecture (32bit vs 64bit). Use u32 unconditionally and remove
the now unneeded omap-mailbox.h include.

Signed-off-by: Andrew Davis <a...@ti.com>
---
 drivers/remoteproc/ti_k3_r5_remoteproc.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c 
b/drivers/remoteproc/ti_k3_r5_remoteproc.c
index ad3415a3851b2..3bcde6d00b56a 100644
--- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
@@ -16,7 +16,6 @@
 #include <linux/of_address.h>
 #include <linux/of_reserved_mem.h>
 #include <linux/of_platform.h>
-#include <linux/omap-mailbox.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/remoteproc.h>
@@ -188,7 +187,7 @@ static void k3_r5_rproc_mbox_callback(struct mbox_client 
*client, void *data)
                                                client);
        struct device *dev = kproc->rproc->dev.parent;
        const char *name = kproc->rproc->name;
-       u32 msg = omap_mbox_message(data);
+       u32 msg = (u32)(uintptr_t)(data);
 
        dev_dbg(dev, "mbox msg: 0x%x\n", msg);
 
@@ -222,11 +221,11 @@ static void k3_r5_rproc_kick(struct rproc *rproc, int 
vqid)
 {
        struct k3_r5_rproc *kproc = rproc->priv;
        struct device *dev = rproc->dev.parent;
-       mbox_msg_t msg = (mbox_msg_t)vqid;
+       u32 msg = vqid;
        int ret;
 
        /* send the index of the triggered virtqueue in the mailbox payload */
-       ret = mbox_send_message(kproc->mbox, (void *)msg);
+       ret = mbox_send_message(kproc->mbox, (void *)(uintptr_t)msg);
        if (ret < 0)
                dev_err(dev, "failed to send mailbox message, status = %d\n",
                        ret);
-- 
2.39.2