From c448c898ae890d966a48c8031b199fda9c6a1d93 Mon Sep 17 00:00:00 2001 From: Horatiu Vultur Date: Tue, 30 Nov 2021 10:57:45 +0100 Subject: [PATCH] net: mdio: mscc-miim: Set back the optional resource. In the blamed commit, the second memory resource was not considered anymore as optional. On some platforms like sparx5 the second resource is optional. So add it back as optional and restore the comment that says so. Fixes: a27a762828375a ("net: mdio: mscc-miim: convert to a regmap implementation") Signed-off-by: Horatiu Vultur Signed-off-by: David S. Miller --- drivers/net/mdio/mdio-mscc-miim.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/net/mdio/mdio-mscc-miim.c b/drivers/net/mdio/mdio-mscc-miim.c index 2d420c9..7d2abaf 100644 --- a/drivers/net/mdio/mdio-mscc-miim.c +++ b/drivers/net/mdio/mdio-mscc-miim.c @@ -219,9 +219,10 @@ EXPORT_SYMBOL(mscc_miim_setup); static int mscc_miim_probe(struct platform_device *pdev) { - struct regmap *mii_regmap, *phy_regmap; + struct regmap *mii_regmap, *phy_regmap = NULL; void __iomem *regs, *phy_regs; struct mscc_miim_dev *miim; + struct resource *res; struct mii_bus *bus; int ret; @@ -239,17 +240,21 @@ static int mscc_miim_probe(struct platform_device *pdev) return PTR_ERR(mii_regmap); } - phy_regs = devm_platform_ioremap_resource(pdev, 1); - if (IS_ERR(phy_regs)) { - dev_err(&pdev->dev, "Unable to map internal phy registers\n"); - return PTR_ERR(phy_regs); - } + /* This resource is optional */ + res = platform_get_resource(pdev, IORESOURCE_MEM, 1); + if (res) { + phy_regs = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(phy_regs)) { + dev_err(&pdev->dev, "Unable to map internal phy registers\n"); + return PTR_ERR(phy_regs); + } - phy_regmap = devm_regmap_init_mmio(&pdev->dev, phy_regs, - &mscc_miim_regmap_config); - if (IS_ERR(phy_regmap)) { - dev_err(&pdev->dev, "Unable to create phy register regmap\n"); - return PTR_ERR(phy_regmap); + phy_regmap = devm_regmap_init_mmio(&pdev->dev, phy_regs, + &mscc_miim_regmap_config); + if (IS_ERR(phy_regmap)) { + dev_err(&pdev->dev, "Unable to create phy register regmap\n"); + return PTR_ERR(phy_regmap); + } } ret = mscc_miim_setup(&pdev->dev, &bus, "mscc_miim", mii_regmap, 0); -- 2.7.4