diff options
| author | Doug Berger <opendmb@gmail.com> | 2020-03-17 00:44:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-03-18 07:00:15 +0300 |
| commit | 612eb1c3b9e504de24136c947ed7c07bc342f3aa (patch) | |
| tree | 277526d2c28e432620e1554eab3b80269241c59e /drivers/net/ethernet/broadcom/genet/bcmgenet.c | |
| parent | d36963b861c1ca352810cec2497e3dabf2333e11 (diff) | |
| download | linux-612eb1c3b9e504de24136c947ed7c07bc342f3aa.tar.xz | |
Revert "net: bcmgenet: use RGMII loopback for MAC reset"
This reverts commit 3a55402c93877d291b0a612d25edb03d1b4b93ac.
This is not a good solution when connecting to an external switch
that may not support the isolation of the TXC signal resulting in
output driver contention on the pin.
A different solution is necessary.
Signed-off-by: Doug Berger <opendmb@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/genet/bcmgenet.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index e50a15397e11..c8ac2d83208f 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c @@ -1989,6 +1989,8 @@ static void reset_umac(struct bcmgenet_priv *priv) /* issue soft reset with (rg)mii loopback to ensure a stable rxclk */ bcmgenet_umac_writel(priv, CMD_SW_RESET | CMD_LCL_LOOP_EN, UMAC_CMD); + udelay(2); + bcmgenet_umac_writel(priv, 0, UMAC_CMD); } static void bcmgenet_intr_disable(struct bcmgenet_priv *priv) |