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: 171761 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp3860758ily; Mon, 19 Aug 2019 21:17:03 -0700 (PDT) X-Google-Smtp-Source: APXvYqxaBYZLP03pgg6MRP7aHaKgN3pkfDmf0QPpT6tlOkwHd5YXh57OcSFl7RkXfinpTsUt63EN X-Received: by 2002:a65:6256:: with SMTP id q22mr22988888pgv.408.1566274622835; Mon, 19 Aug 2019 21:17:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566274622; cv=none; d=google.com; s=arc-20160816; b=dytn3GCghVdMio00a9vpMcCaZko32q+DnZNpCYwGCuDE2OGkGY0RouM55IIpWy79kF P0t0uFqPk7pMNeR39tmrhpKjvw17bCpj9j7FM/4yJ1pq6Yz488VLqI+ua5ok9qx4zXur VG+66CK3F9c7McPzRMsZsABXNRDoctPjipfs2+HK0UnJgrmAmDbISCTaF60vvgVVS74a iMFrKS0Ma83jOzo/6FlO6zbFX4ras+voveaWC1CqoRH7TXDzWav7T60Hl9N+lckNIepH V8Qm0gKc9zxzYWAEyLbDq1RCdx0JyXgWh4ocUX4DHajp61UxWUIubS0OSLHTOMkOKzno A3sA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=KbKypMZEMo628Sx98GbFT2Lyxp3a3o8vbOSGro2hqs8=; b=XTFLczGRKSr0pTsvZyWjYHdVelJVCRhafVtMFwdHBxgny000VFG+fRDbCXOftxt7Bm qM3ENUcBCX7UmHLFisgv6NaM3XCuR1HyuCpKufX8aWL3EqZOJXWpdWGku8x77e7xc1gs ya0bciqkxFcwvNR2WUsuNEMuO6qzm6nJ+sVIbyJZQGU3g2StXYeK3req3UXV7ADe8W3I mjpk/6JGPLtHJcJSxLN/U+rJI88tiJ7hgd05WYz3NmNpn46EdEtSBySpOBw+kOJxogcp afVqwgkOhqnJdNdpn/yrqHqsxb9ZUenjilPq9MnGJNHJo0vALz8iYp6ZvyN6Coppp3HS 8XtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BbMcDsfd; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g7si12348357pfk.224.2019.08.19.21.17.02; Mon, 19 Aug 2019 21:17:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BbMcDsfd; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729085AbfHTERB (ORCPT + 16 others); Tue, 20 Aug 2019 00:17:01 -0400 Received: from mail-pl1-f193.google.com ([209.85.214.193]:44324 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728248AbfHTERB (ORCPT ); Tue, 20 Aug 2019 00:17:01 -0400 Received: by mail-pl1-f193.google.com with SMTP id t14so2037006plr.11 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=PWydVA7SG0jc/iZPQU4ZZKpHXB1u1QvW7dBL6kko+jzY3AomHxqvF4cA/3dX7loet8 m+S1kJLSXg99pmYeWn9eU6fSYgdydBAly/Md1bU+cUYlP8TTDbXSoB5CgCc+JUk+zUbP ULlWuuMRJ3urk4KHZ+DSf2M8/rnzMhtSPOdTR0QgDt0sF6fB3UcGo7XaZC5DwUv6yHn+ Dyf0H8B5bxAiN4b5TeH7VfRFgaRGXzGzOgVv/FGTh0xZI3swhZ2IfRSj5oqb1vFrMOeg KUZkXc8IXWVJ3DACfplUsM90DCXd0RGT2rR5nvmEPxTr/meT0XrXU/swzVzQPvCnOlV4 SMTw== X-Gm-Message-State: APjAAAVxZI4xAR+RPb/fohGsE6e10KDiTd9VszNbWdGWAkDOEyT220ao QcqjC7jTZAklyqHKD0Tjpxo/Vw== 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-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 --- drivers/rpmsg/qcom_glink_smem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.18.0 Reviewed-by: Niklas Cassel 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");