2022-02-16 12:50:52

by Michael Walle

Subject: [PATCH] pinctrl: ocelot: fix duplicate debugfs entry

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 <[email protected]>
---
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 a859fbcb09af..35b213de1af8 100644
--- a/drivers/pinctrl/pinctrl-ocelot.c
+++ b/drivers/pinctrl/pinctrl-ocelot.c
@@ -1890,6 +1890,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);
--
2.30.2

2022-02-16 17:22:15

by Colin Foster

Subject: Re: [PATCH] pinctrl: ocelot: fix duplicate debugfs entry

On Wed, Feb 16, 2022 at 01:27:27PM +0100, Michael Walle wrote:
> 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 <[email protected]>
> ---
> 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 a859fbcb09af..35b213de1af8 100644
> --- a/drivers/pinctrl/pinctrl-ocelot.c
> +++ b/drivers/pinctrl/pinctrl-ocelot.c
> @@ -1890,6 +1890,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);
> --
> 2.30.2
>

Reviewed-by: Colin Foster <[email protected]>

2022-03-15 11:30:41

by Linus Walleij

Subject: Re: [PATCH] pinctrl: ocelot: fix duplicate debugfs entry

On Wed, Feb 16, 2022 at 1:27 PM Michael Walle <[email protected]> wrote:

> 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 <[email protected]>

Patch applied!

Yours,
Linus Walleij