From patchwork Tue Apr 5 07:25:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 558012 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C987C4167D for ; Tue, 5 Apr 2022 08:32:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235991AbiDEI1O (ORCPT ); Tue, 5 Apr 2022 04:27:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239483AbiDEIUH (ORCPT ); Tue, 5 Apr 2022 04:20:07 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FDF0B0D26; Tue, 5 Apr 2022 01:14:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 9C3AC60AFB; Tue, 5 Apr 2022 08:14:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADD4FC385A0; Tue, 5 Apr 2022 08:14:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649146447; bh=WHog4N/cB+r7Q5qVBu/VTZU2oQBTeZ6/4VO5wSsfzc0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GtoolzIK+OJdHI1CLlmRp5Zl5yPEyrNHUl9su5HHf1FFzZ7wllLvddw0cmTsZYMBu A/5V6tECpd14rCoxMXYXdf6qNDSL9soHsscnAUMewCpE9VjkZfq2lPwgZaKQMqQz9+ 2yxhAVuhCoYYkv8OjOukk1tAxSOP1zYh88NO7mMM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Walle , Colin Foster , Linus Walleij , Sasha Levin Subject: [PATCH 5.17 0768/1126] pinctrl: ocelot: fix duplicate debugfs entry Date: Tue, 5 Apr 2022 09:25:15 +0200 Message-Id: <20220405070430.125185334@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070407.513532867@linuxfoundation.org> References: <20220405070407.513532867@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Michael Walle [ Upstream commit 359afd90fef3ec9285432f50720c813987df4a89 ] This driver can have up to two regmaps. If the second one is registered its debugfs entry will have the same name as the first one and the following error will be printed: [ 2.242568] debugfs: Directory 'e2004064.pinctrl' with parent 'regmap' already present! Give the second regmap a name to avoid this. Fixes: 076d9e71bcf8 ("pinctrl: ocelot: convert pinctrl to regmap") Signed-off-by: Michael Walle Reviewed-by: Colin Foster Link: https://lore.kernel.org/r/20220216122727.1005041-1-michael@walle.cc Signed-off-by: Linus Walleij Signed-off-by: Sasha Levin --- drivers/pinctrl/pinctrl-ocelot.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index a719c0bfbc91..9c13a7c90fc3 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c @@ -1788,6 +1788,7 @@ static struct regmap *ocelot_pinctrl_create_pincfg(struct platform_device *pdev) .val_bits = 32, .reg_stride = 4, .max_register = 32, + .name = "pincfg", }; base = devm_platform_ioremap_resource(pdev, 1);