From patchwork Tue Aug 20 04:16:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 11102817 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E95EC1805 for ; Tue, 20 Aug 2019 04:17:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C860E22CF4 for ; Tue, 20 Aug 2019 04:17:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="BbMcDsfd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729095AbfHTERB (ORCPT ); Tue, 20 Aug 2019 00:17:01 -0400 Received: from mail-pl1-f195.google.com ([209.85.214.195]:32831 "EHLO mail-pl1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728960AbfHTERB (ORCPT ); Tue, 20 Aug 2019 00:17:01 -0400 Received: by mail-pl1-f195.google.com with SMTP id go14so2051736plb.0 for ; Mon, 19 Aug 2019 21:17:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=KbKypMZEMo628Sx98GbFT2Lyxp3a3o8vbOSGro2hqs8=; b=BbMcDsfdhYJbYQOF4+aYA+FByqe1YzCp/GVmlI4KBpJik0CSaiyOMnbGH8m3TiqELX s4cEulkc1aWYVE0YqhE3Zgn8RO2mrIJ+vTMekI/vxsli4czBtUJA3lrnGfjK48ncRyBt 5eOTSVG8tSarLdTZM/Mgld7VoxpN0p+9jb10g+l8q2JiGwBzB32Sdx16m3FUCg1i3UK2 cUQRM6vLlhJbXk9WlqsISZah7xFjoLA1LLtMlpOCejDe85h3kOtM8xqxR//2Bh44v+3o dB/g1IRRMS9DwDLj9NIF/NaKw+Y3XfLNEPXYCd8rLtmOlUsym/69sM9Iouv3xzrrND4S WsVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KbKypMZEMo628Sx98GbFT2Lyxp3a3o8vbOSGro2hqs8=; b=WwENUf5yGz/hIsxJaSNqfbHGZ8ZNIj5KXIwNvnWPfEslPz84DOMN3FiELdq+KR4UFU gLym+jfPuE5F49UjHvkCmLHMPKHx0tOmsxCG2URexbe7XRU+fqS+S7RtxujINOgppzec 89HGonfbgcJFcmtJnvCwohQvrMXxLuZHLi+y9yPG/wrQf7FiTSfLJDiql83QNu96BRNq sVzadaRS9c8LAIOyNTaqgkWjXZXg8y68KuQcx8g8/iV24ThY/mg9ft6WveuXuFWof0SG o1WRhQLBVVTaqHl4Ahd1EX1SMafnBskuMJbRvW6i7ybBFr2hKLzZxNkJhGpz4IxsgQKA wHpg== X-Gm-Message-State: APjAAAUThbz6/wcQSj/ILdGtkGl0TZ3YPKVSI6wCMsOkaFHFHgf30oDK GnLbN5WUFtWqde7c84daSRDf+f1KbEs= X-Google-Smtp-Source: APXvYqzpynUE9tTdOCXExz9bKNqsRxtU0Zbjd9lhUYl/ghqc72gIr293dR2Ts5fcabGAmXXs5bn+Eg== X-Received: by 2002:a17:902:4401:: with SMTP id k1mr26180562pld.193.1566274620467; Mon, 19 Aug 2019 21:17:00 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id j6sm35010849pje.11.2019.08.19.21.16.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Aug 2019 21:16:59 -0700 (PDT) From: Bjorn Andersson To: Ohad Ben-Cohen , Bjorn Andersson Cc: linux-arm-msm@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [PATCH] rpmsg: glink-smem: Name the edge based on parent remoteproc Date: Mon, 19 Aug 2019 21:16:56 -0700 Message-Id: <20190820041656.17197-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org 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. Signed-off-by: Bjorn Andersson Reviewed-by: Niklas Cassel --- drivers/rpmsg/qcom_glink_smem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rpmsg/qcom_glink_smem.c b/drivers/rpmsg/qcom_glink_smem.c index 64a5ce324c7f..4238383d8685 100644 --- 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");