diff options
| author |   David S. Miller <davem@davemloft.net> | 2020-01-09 12:10:26 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-01-09 12:13:43 -0800 |
| commit | a2d6d7ae591c47ebc04926cb29a840adfdde49e6 (patch) | |
| tree | be464f987f0ab690481e2783d680aa88574026e4 /drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | |
| parent | Merge branch 'sfc-more-code-refactoring' (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid (diff) | |
| download | linux-dev-a2d6d7ae591c47ebc04926cb29a840adfdde49e6.tar.xz linux-dev-a2d6d7ae591c47ebc04926cb29a840adfdde49e6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The ungrafting from PRIO bug fixes in net, when merged into net-next,
merge cleanly but create a build failure. The resolution used here is
from Petr Machata.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c')
| -rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c index 6f834302fda3..58e0511badba 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c @@ -973,6 +973,9 @@ static int sun8i_dwmac_set_syscon(struct stmmac_priv *priv) /* default */ break; case PHY_INTERFACE_MODE_RGMII: + case PHY_INTERFACE_MODE_RGMII_ID: + case PHY_INTERFACE_MODE_RGMII_RXID: + case PHY_INTERFACE_MODE_RGMII_TXID: reg |= SYSCON_EPIT | SYSCON_ETCS_INT_GMII; break; case PHY_INTERFACE_MODE_RMII: |