diff options
| author | Joel Stanley <joel@jms.id.au> | 2022-04-27 11:56:32 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2022-04-27 11:56:35 +0300 |
| commit | 85595a78a523118d962c625b21dce270210244a9 (patch) | |
| tree | 0c1c76226e44cc5e9b1139a706ccd6b717d88155 /drivers/net/ethernet/faraday | |
| parent | fc8ba762618d0f80130ea68853692c52402d0b36 (diff) | |
| parent | 81d8d30c35edf29c5c70186ccb14dac4a5ca38a8 (diff) | |
| download | linux-85595a78a523118d962c625b21dce270210244a9.tar.xz | |
Merge tag 'v5.15.35' into dev-5.15
This is the 5.15.35 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/net/ethernet/faraday')
| -rw-r--r-- | drivers/net/ethernet/faraday/ftgmac100.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c index 239eb4e2e501..c96d4bf4d5e3 100644 --- a/drivers/net/ethernet/faraday/ftgmac100.c +++ b/drivers/net/ethernet/faraday/ftgmac100.c @@ -1827,11 +1827,6 @@ static int ftgmac100_probe(struct platform_device *pdev) priv->rxdes0_edorr_mask = BIT(30); priv->txdes0_edotr_mask = BIT(30); priv->is_aspeed = true; - /* Disable ast2600 problematic HW arbitration */ - if (of_device_is_compatible(np, "aspeed,ast2600-mac")) { - iowrite32(FTGMAC100_TM_DEFAULT, - priv->base + FTGMAC100_OFFSET_TM); - } } else { priv->rxdes0_edorr_mask = BIT(15); priv->txdes0_edotr_mask = BIT(15); @@ -1903,6 +1898,11 @@ static int ftgmac100_probe(struct platform_device *pdev) err = ftgmac100_setup_clk(priv); if (err) goto err_phy_connect; + + /* Disable ast2600 problematic HW arbitration */ + if (of_device_is_compatible(np, "aspeed,ast2600-mac")) + iowrite32(FTGMAC100_TM_DEFAULT, + priv->base + FTGMAC100_OFFSET_TM); } /* Default ring sizes */ |