Skip to content

Commit

Permalink
net: mdio: mscc-miim: Fix the mdio controller
Browse files Browse the repository at this point in the history
According to the documentation the second resource is optional. But the
blamed commit ignores that and if the resource is not there it just
fails.

This patch reverts that to still allow the second resource to be
optional because other SoC have the some MDIO controller and doesn't
need to second resource.

Fixes: 672a1c3 ("net: mdio: mscc-miim: Make use of the helper function devm_platform_ioremap_resource()")
Signed-off-by: Horatiu Vultur <horatiu.vultur@microchip.com>
Reviewed-by: Cai Huoqing <caihuoqing@baidu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Horatiu Vultur authored and David S. Miller committed Sep 28, 2021
1 parent f4bd73b commit c699511
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions drivers/net/mdio/mdio-mscc-miim.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,9 @@ static int mscc_miim_reset(struct mii_bus *bus)

static int mscc_miim_probe(struct platform_device *pdev)
{
struct mii_bus *bus;
struct mscc_miim_dev *dev;
struct resource *res;
struct mii_bus *bus;
int ret;

bus = devm_mdiobus_alloc_size(&pdev->dev, sizeof(*dev));
Expand All @@ -156,10 +157,14 @@ static int mscc_miim_probe(struct platform_device *pdev)
return PTR_ERR(dev->regs);
}

dev->phy_regs = devm_platform_ioremap_resource(pdev, 1);
if (IS_ERR(dev->phy_regs)) {
dev_err(&pdev->dev, "Unable to map internal phy registers\n");
return PTR_ERR(dev->phy_regs);
/* This resource is optional */
res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
if (res) {
dev->phy_regs = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(dev->phy_regs)) {
dev_err(&pdev->dev, "Unable to map internal phy registers\n");
return PTR_ERR(dev->phy_regs);
}
}

ret = of_mdiobus_register(bus, pdev->dev.of_node);
Expand Down

0 comments on commit c699511

Please sign in to comment.