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

Commit 22176cc5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: emac: move init adapter to post phase2 clocks enablement"

parents 959d7217 8c97ea87

drivers/net/ethernet/qualcomm/emac/emac_main.c

+5 −5
Original line number Diff line number Diff line
@@ -3093,8 +3093,6 @@ static int emac_probe(struct platform_device *pdev) 
	if (ret)

		goto err_clk_init;



	hw_ver = emac_reg_r32(hw, EMAC, EMAC_CORE_HW_VERSION);



	netdev->watchdog_timeo = EMAC_WATCHDOG_TIME;

	netdev->irq = adpt->irq[0].irq;
@@ -3114,9 +3112,6 @@ static int emac_probe(struct platform_device *pdev) 


	emac_set_ethtool_ops(netdev);



	/* init adapter */

	emac_init_adapter(adpt);



	/* init internal phy */

	ret = emac_phy_config_internal(pdev, adpt);

	if (ret)
@@ -3127,6 +3122,11 @@ static int emac_probe(struct platform_device *pdev) 
	if (ret)

		goto err_clk_init;



	hw_ver = emac_reg_r32(hw, EMAC, EMAC_CORE_HW_VERSION);



	/* init adapter */

	emac_init_adapter(adpt);



	/* Configure MDIO lines */

	ret = adpt->gpio_on(adpt, true, true);

	if (ret)