Commit 0f8946ae authored by Michael Walle's avatar Michael Walle Committed by Jakub Kicinski

net: mdio: mscc-miim: 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:

[    3.833521] debugfs: Directory 'e200413c.mdio' with parent 'regmap' already present!

Give the second regmap a name to avoid this.

Fixes: a27a7628 ("net: mdio: mscc-miim: convert to a regmap implementation")
Signed-off-by: default avatarMichael Walle <michael@walle.cc>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220312224140.4173930-1-michael@walle.ccSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 15d70392
...@@ -187,6 +187,13 @@ static const struct regmap_config mscc_miim_regmap_config = { ...@@ -187,6 +187,13 @@ static const struct regmap_config mscc_miim_regmap_config = {
.reg_stride = 4, .reg_stride = 4,
}; };
static const struct regmap_config mscc_miim_phy_regmap_config = {
.reg_bits = 32,
.val_bits = 32,
.reg_stride = 4,
.name = "phy",
};
int mscc_miim_setup(struct device *dev, struct mii_bus **pbus, const char *name, int mscc_miim_setup(struct device *dev, struct mii_bus **pbus, const char *name,
struct regmap *mii_regmap, int status_offset) struct regmap *mii_regmap, int status_offset)
{ {
...@@ -250,7 +257,7 @@ static int mscc_miim_probe(struct platform_device *pdev) ...@@ -250,7 +257,7 @@ static int mscc_miim_probe(struct platform_device *pdev)
} }
phy_regmap = devm_regmap_init_mmio(&pdev->dev, phy_regs, phy_regmap = devm_regmap_init_mmio(&pdev->dev, phy_regs,
&mscc_miim_regmap_config); &mscc_miim_phy_regmap_config);
if (IS_ERR(phy_regmap)) { if (IS_ERR(phy_regmap)) {
dev_err(&pdev->dev, "Unable to create phy register regmap\n"); dev_err(&pdev->dev, "Unable to create phy register regmap\n");
return PTR_ERR(phy_regmap); return PTR_ERR(phy_regmap);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment