summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorMichael Walle <michael@walle.cc>2022-02-16 13:27:27 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-04-08 13:58:29 +0200
commit898851b2a0473f6eafba6e6795f74e01d70dcc2e (patch)
tree35dbe1d71155c44d4dfc87fb146b5e17102b6d8c /drivers/pinctrl
parentfa4e3ee5765138cfa69e2b5a743a3e9dd54e57a6 (diff)
downloadlinux-stable-898851b2a0473f6eafba6e6795f74e01d70dcc2e.tar.gz
linux-stable-898851b2a0473f6eafba6e6795f74e01d70dcc2e.tar.bz2
linux-stable-898851b2a0473f6eafba6e6795f74e01d70dcc2e.zip
pinctrl: ocelot: fix duplicate debugfs entry
[ 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 <michael@walle.cc> Reviewed-by: Colin Foster <colin.foster@in-advantage.com> Link: https://lore.kernel.org/r/20220216122727.1005041-1-michael@walle.cc Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/pinctrl-ocelot.c1
1 files changed, 1 insertions, 0 deletions
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);