Commit c6995117 authored by Horatiu Vultur's avatar Horatiu Vultur Committed by David S. Miller
Browse files

net: mdio: mscc-miim: Fix the mdio controller 



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: 672a1c39 ("net: mdio: mscc-miim: Make use of the helper function devm_platform_ioremap_resource()")
Signed-off-by: default avatarHoratiu Vultur <horatiu.vultur@microchip.com>
Reviewed-by: default avatarCai Huoqing <caihuoqing@baidu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4bd73b5

drivers/net/mdio/mdio-mscc-miim.c

+10 −5
Original line number Diff line number Diff line
@@ -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));
@@ -156,11 +157,15 @@ static int mscc_miim_probe(struct platform_device *pdev) 
		return PTR_ERR(dev->regs);

	}



	dev->phy_regs = devm_platform_ioremap_resource(pdev, 1);

	/* 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);

	if (ret < 0) {