summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimur Tabi2017-06-23 21:33:29 +0200
committerDavid S. Miller2017-06-25 17:44:29 +0200
commit867ae6abc24967188db0914de170512e36592eb3 (patch)
treeca69393db13f403b2a9235bccd5cf805dd0ee8cf
parentnet: qcom/emac: add shutdown function (diff)
downloadkernel-qcow2-linux-867ae6abc24967188db0914de170512e36592eb3.tar.gz
kernel-qcow2-linux-867ae6abc24967188db0914de170512e36592eb3.tar.xz
kernel-qcow2-linux-867ae6abc24967188db0914de170512e36592eb3.zip
net: qcom/emac: do not reset the EMAC during initialization
On ACPI systems, the driver depends on firmware pre-initializing the EMAC because we don't have access to the clocks, and the EMAC has specific clock programming requirements. Therefore, we don't want to reset the EMAC while we are completing the initialization. Tested-by: Richard Ruigrok <rruigrok@codeaurora.org> Signed-off-by: Timur Tabi <timur@codeaurora.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/qualcomm/emac/emac.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c
index 77c5c929f141..746d94e28470 100644
--- a/drivers/net/ethernet/qualcomm/emac/emac.c
+++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -683,8 +683,6 @@ static int emac_probe(struct platform_device *pdev)
goto err_undo_mdiobus;
}
- emac_mac_reset(adpt);
-
/* set hw features */
netdev->features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_RXCSUM |
NETIF_F_TSO | NETIF_F_TSO6 | NETIF_F_HW_VLAN_CTAG_RX |