@@ -47,6 +47,7 @@ struct arm_mhu {
struct mhu_link mlink[MHU_NUM_PCHANS];
struct mbox_controller mbox;
struct device *dev;
+ const char *name;
};
/**
@@ -257,8 +258,8 @@ static struct mbox_chan *mhu_mbox_xlate(struct mbox_controller *mbox,
chan->con_priv = chan_info;
- dev_dbg(mbox->dev, "mbox: created channel - physical: %d sub: %d\n",
- pchan, subchan);
+ dev_dbg(mbox->dev, "mbox: %s, created channel - physical: %d sub: %d\n",
+ mhu->name, pchan, subchan);
return chan;
}
@@ -361,6 +362,7 @@ static int mhu_probe(struct amba_device *adev, const struct amba_id *id)
struct mhu_mbox_pdata *pdata;
const struct of_device_id *match;
struct device *dev = &adev->dev;
+ struct device_node *np = dev->of_node;
int mhu_reg[MHU_NUM_PCHANS] = {
MHU_LP_OFFSET, MHU_HP_OFFSET, MHU_SEC_OFFSET,
};
@@ -390,6 +392,10 @@ static int mhu_probe(struct amba_device *adev, const struct amba_id *id)
return PTR_ERR(mhu->base);
}
+ err = of_property_read_string(np, "mbox-name", &mhu->name);
+ if (err)
+ mhu->name = np->full_name;
+
chans = devm_kcalloc(dev, max_chans, sizeof(*chans), GFP_KERNEL);
if (!chans)
return -ENOMEM;
@@ -441,7 +447,7 @@ static int mhu_probe(struct amba_device *adev, const struct amba_id *id)
}
}
- dev_info(dev, "ARM MHU Mailbox registered\n");
+ dev_info(dev, "%s mailbox registered\n", mhu->name);
return 0;
}
It's sometimes useful to identify the mailbox controller with the name as specified in the devicetree via mbox-name property especially in a system with multiple controllers. This patch adds support to read and record the mailbox controller name. Cc: Alexey Klimov <alexey.klimov@arm.com> Cc: Jassi Brar <jaswinder.singh@linaro.org> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- drivers/mailbox/arm_mhu.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.7.4