From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6CF3EC433F5 for ; Tue, 9 Nov 2021 16:53:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 29DD061131 for ; Tue, 9 Nov 2021 16:53:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 29DD061131 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V59uGkVc0OP/s899FW6pGmF0MPBKd+fCp1OuXM7xVco=; b=AqvT2VfPb3KHZY YhM7GxiUuC7zbj1hrhWC9k7A7sXyIEGEg/iUsbauIAXcGtokKxH5/JaCqnNPrBNs20ZAgXoT08HwJ oGEIfaPTa8O89qQ2oAdWr9Rlr4ufqZxB5o6cQHYwsg4e/XjLc6PG5FjtBa/GkNdcv2ab644xkjc6z F0Fpbf0AQoJTvsf01glUTENeT+7ILt1c0+3Qata6Xd/HFufUMUVPbGY4FuDoH+KfSOhjYjfgukw/w PGNjFDok1WDPr6d61w20sZYqIJLiPAFCNqQdaWD0l/NhBqnVfhSeTtXSX85VIUauuKwaNOevSJEDk EeBFYcGQfqsy4i2XN3vg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkULt-002loR-V3; Tue, 09 Nov 2021 16:52:06 +0000 Received: from mail-ot1-f45.google.com ([209.85.210.45]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkUGt-002jSm-Gf for linux-arm-kernel@lists.infradead.org; Tue, 09 Nov 2021 16:46:56 +0000 Received: by mail-ot1-f45.google.com with SMTP id l7-20020a0568302b0700b0055ae988dcc8so28550035otv.12 for ; Tue, 09 Nov 2021 08:46:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QCdrW6y17rvAkzqtUwRB26cgRdpTc9nbRuh6smuG2g4=; b=saqfy8ziOl2twT/Dr009+Tzu75+WnUUCurJl10nXbEGYc0f4JbE9+WJ7ikgk2eKdcf 1kGZeqKCul9UycHvyQI6eio1JivmOcFYSD+zsoN2g6E7KKFmJZJEFu9GDqiRQWOixxDw OoO0+syNBa2Vq9FIRMeMFjIhguO2MaZtem6pjSAA8lnb7E7i6IXDt7vDSqAGEt0lQqju m/Q+BozG4aC2UIU8B/HMCQNPoIQKzUloBgbPS1CN64IeSP7fHsD5+yCWkHSj2dfYvuIr sj0yf0ZUcbotVKmGdoLijaZCYJJarIxYGVP4YvH0g6lvxKs4ImprdGUiaMYZlvvVpuB4 WH4A== X-Gm-Message-State: AOAM532kVgyAvZINwM+7Syp0dB2DBRo55SuzqEXd+iKTgZdCjqPi1E1c Nnit3S+BeIFo21u2mKdyYA== X-Google-Smtp-Source: ABdhPJxSAu+FQ6ljH9p3Bj1Mz+tnr8g+QT2ZzHNPysDfdOzlazvbmApXPmhaR1GAB/4u0MlYuICJmQ== X-Received: by 2002:a9d:a2b:: with SMTP id 40mr7366147otg.100.1636476414810; Tue, 09 Nov 2021 08:46:54 -0800 (PST) Received: from xps15.herring.priv (66-90-148-213.dyn.grandenetworks.net. [66.90.148.213]) by smtp.googlemail.com with ESMTPSA id w22sm7514338otp.50.2021.11.09.08.46.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 08:46:54 -0800 (PST) From: Rob Herring To: Linus Walleij , Stephen Boyd , Sudeep Holla Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Guenter Roeck , Lorenzo Pieralisi , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/2] clk: versatile: clk-icst: Ensure clock names are unique Date: Tue, 9 Nov 2021 10:46:50 -0600 Message-Id: <20211109164650.2233507-3-robh@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211109164650.2233507-1-robh@kernel.org> References: <20211109164650.2233507-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211109_084655_595790_FB94DBB2 X-CRM114-Status: GOOD ( 16.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and node names") moved to using generic node names. That results in trying to register multiple clocks with the same name. Fix this by including the unit-address in the clock name. Fixes: 2d3de197a818 ("ARM: dts: arm: Update ICST clock nodes 'reg' and node names") Cc: stable@vger.kernel.org Cc: Linus Walleij Cc: Stephen Boyd Cc: linux-arm-kernel@lists.infradead.org Cc: linux-clk@vger.kernel.org Signed-off-by: Rob Herring --- This should be applied to stable to minimize DT ABI breakage. --- drivers/clk/versatile/clk-icst.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/clk/versatile/clk-icst.c b/drivers/clk/versatile/clk-icst.c index 77fd0ecaf155..d52f976dc875 100644 --- a/drivers/clk/versatile/clk-icst.c +++ b/drivers/clk/versatile/clk-icst.c @@ -484,7 +484,7 @@ static void __init of_syscon_icst_setup(struct device_node *np) struct device_node *parent; struct regmap *map; struct clk_icst_desc icst_desc; - const char *name = np->name; + const char *name; const char *parent_name; struct clk *regclk; enum icst_control_type ctype; @@ -533,15 +533,17 @@ static void __init of_syscon_icst_setup(struct device_node *np) icst_desc.params = &icst525_apcp_cm_params; ctype = ICST_INTEGRATOR_CP_CM_MEM; } else { - pr_err("unknown ICST clock %s\n", name); + pr_err("unknown ICST clock %pOF\n", np); return; } /* Parent clock name is not the same as node parent */ parent_name = of_clk_get_parent_name(np, 0); + name = kasprintf(GFP_KERNEL, "%pOFP", np); regclk = icst_clk_setup(NULL, &icst_desc, name, parent_name, map, ctype); if (IS_ERR(regclk)) { + kfree(name); pr_err("error setting up syscon ICST clock %s\n", name); return; } -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel