Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d934423a authored by Arnaud Patard's avatar Arnaud Patard Committed by David S. Miller
Browse files

drivers/net/ethernet/marvell/mvmdio.c: Fix non OF case 

Orion5.x systems are still using machine files and not device-tree.
Commit 96cb4342 ("net: mvmdio: allow up to three clocks to be
specified for orion-mdio") has replaced devm_clk_get() with of_clk_get(),
leading to a oops at boot and not working network, as reported in
https://lists.debian.org/debian-arm/2019/07/msg00088.html and possibly in
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908712.

Link: https://lists.debian.org/debian-arm/2019/07/msg00088.html


Fixes: 96cb4342 ("net: mvmdio: allow up to three clocks to be specified for orion-mdio")
Signed-off-by: default avatarArnaud Patard <arnaud.patard@rtp-net.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd206360

drivers/net/ethernet/marvell/mvmdio.c

+22 −9
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ static int orion_mdio_probe(struct platform_device *pdev) 


	init_waitqueue_head(&dev->smi_busy_wait);



	if (pdev->dev.of_node) {

		for (i = 0; i < ARRAY_SIZE(dev->clk); i++) {

			dev->clk[i] = of_clk_get(pdev->dev.of_node, i);

			if (PTR_ERR(dev->clk[i]) == -EPROBE_DEFER) {
@@ -330,9 +331,21 @@ static int orion_mdio_probe(struct platform_device *pdev) 
			clk_prepare_enable(dev->clk[i]);

		}



	if (!IS_ERR(of_clk_get(pdev->dev.of_node, ARRAY_SIZE(dev->clk))))

		dev_warn(&pdev->dev, "unsupported number of clocks, limiting to the first "

		if (!IS_ERR(of_clk_get(pdev->dev.of_node,

				       ARRAY_SIZE(dev->clk))))

			dev_warn(&pdev->dev,

				 "unsupported number of clocks, limiting to the first "

				 __stringify(ARRAY_SIZE(dev->clk)) "\n");

	} else {

		dev->clk[0] = clk_get(&pdev->dev, NULL);

		if (PTR_ERR(dev->clk[0]) == -EPROBE_DEFER) {

			ret = -EPROBE_DEFER;

			goto out_clk;

		}

		if (!IS_ERR(dev->clk[0]))

			clk_prepare_enable(dev->clk[0]);

	}





	dev->err_interrupt = platform_get_irq(pdev, 0);

	if (dev->err_interrupt > 0 &&