From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bjorn Andersson Subject: [PATCH] rpmsg: qcom_smd: Add support for "label" property Date: Thu, 1 Dec 2016 17:06:14 -0800 Message-ID: <1480640774-20278-1-git-send-email-bjorn.andersson@linaro.org> Return-path: Received: from mail-pg0-f53.google.com ([74.125.83.53]:33569 "EHLO mail-pg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754527AbcLBBGR (ORCPT ); Thu, 1 Dec 2016 20:06:17 -0500 Received: by mail-pg0-f53.google.com with SMTP id 3so100958611pgd.0 for ; Thu, 01 Dec 2016 17:06:17 -0800 (PST) Sender: linux-arm-msm-owner@vger.kernel.org List-Id: linux-arm-msm@vger.kernel.org To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org Add support for the "label" property, used to give the edge a name other than the one of the DT node. This allows the implementor to provide consistently named edges when using the rpmsg character device. Signed-off-by: Bjorn Andersson --- drivers/rpmsg/qcom_smd.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 5549cd7fc2ef..7552ef0e82ba 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -117,6 +117,8 @@ static const struct { struct qcom_smd_edge { struct device dev; + const char *name; + struct device_node *of_node; unsigned edge_id; unsigned remote_pid; @@ -1278,6 +1280,10 @@ static int qcom_smd_parse_edge(struct device *dev, return -EINVAL; } + ret = of_property_read_string(node, "label", &edge->name); + if (ret < 0) + edge->name = node->name; + irq = irq_of_parse_and_map(node, 0); if (irq < 0) { dev_err(dev, "required smd interrupt missing\n"); @@ -1320,7 +1326,7 @@ static ssize_t rpmsg_name_show(struct device *dev, { struct qcom_smd_edge *edge = to_smd_edge(dev); - return sprintf(buf, "%s\n", edge->of_node->name); + return sprintf(buf, "%s\n", edge->name); } static DEVICE_ATTR_RO(rpmsg_name); -- 2.5.0