]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: mdio: mscc-miim: fix duplicate debugfs entry
authorMichael Walle <michael@walle.cc>
Sat, 12 Mar 2022 22:41:40 +0000 (23:41 +0100)
committerJakub Kicinski <kuba@kernel.org>
Tue, 15 Mar 2022 05:04:15 +0000 (22:04 -0700)
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: ec4bd430fec2 ("net: mdio: mscc-miim: convert to a regmap implementation")
Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220312224140.4173930-1-michael@walle.cc
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/mdio/mdio-mscc-miim.c

index 7d2abaf2b2c9774ba074274302bb8bb7f81139ad..64fb76c1e3959836b05a4b4c294ad07ed9e4d510 100644 (file)
@@ -187,6 +187,13 @@ static const struct regmap_config mscc_miim_regmap_config = {
        .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,
                    struct regmap *mii_regmap, int status_offset)
 {
@@ -250,7 +257,7 @@ static int mscc_miim_probe(struct platform_device *pdev)
                }
 
                phy_regmap = devm_regmap_init_mmio(&pdev->dev, phy_regs,
-                                                  &mscc_miim_regmap_config);
+                                                  &mscc_miim_phy_regmap_config);
                if (IS_ERR(phy_regmap)) {
                        dev_err(&pdev->dev, "Unable to create phy register regmap\n");
                        return PTR_ERR(phy_regmap);