rpmsg: glink-smem: Name the edge based on parent remoteproc

Naming the glink edge device on the parent of_node short name causes
collisions when multiple remoteproc instances with only different unit
address are described on the platform_bus in DeviceTree.

Base the edge's name on the parent remoteproc's name instead, to ensure
that it's unique.

Reviewed-by: Niklas Cassel <[email protected]>
Signed-off-by: Bjorn Andersson <[email protected]>

diff --git a/drivers/rpmsg/qcom_glink_smem.c b/drivers/rpmsg/qcom_glink_smem.c
index 64a5ce324c7f7e52b740db8a86d62ed84c3111e7..4238383d8685ac6ae8406b8687a37f2eed25bcda 100644 (file)
--- a/drivers/rpmsg/qcom_glink_smem.c
+++ b/drivers/rpmsg/qcom_glink_smem.c
@@ -201,7 +201,7 @@ struct qcom_glink *qcom_glink_smem_register(struct device *parent,
        dev->parent = parent;
        dev->of_node = node;
        dev->release = qcom_glink_smem_release;
-       dev_set_name(dev, "%pOFn:%pOFn", node->parent, node);
+       dev_set_name(dev, "%s:%pOFn", dev_name(parent->parent), node);
        ret = device_register(dev);
        if (ret) {
                pr_err("failed to register glink edge\n");