net: ethernet: nb8800: Handle all 4 RGMII modes identically

Before commit bf8f6952a233 ("Add blurb about RGMII") it was unclear
whose responsibility it was to insert the required clock skew, and
in hindsight, some PHY drivers got it wrong. The solution forward
is to introduce a new property, explicitly requiring skew from the
node to which it is attached. In the interim, this driver will handle
all 4 RGMII modes identically (no skew).

Fixes: 52dfc8301248 ("net: ethernet: add driver for Aurora VLSI NB8800 Ethernet controller")
Signed-off-by: Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c
index 041cfb7952f8..e94159507847 100644
--- a/drivers/net/ethernet/aurora/nb8800.c
+++ b/drivers/net/ethernet/aurora/nb8800.c
@@ -609,7 +609,7 @@ static void nb8800_mac_config(struct net_device *dev)
                 mac_mode |= HALF_DUPLEX;
 
         if (gigabit) {
-                if (priv->phy_mode == PHY_INTERFACE_MODE_RGMII)
+                if (phy_interface_is_rgmii(dev->phydev))
                         mac_mode |= RGMII_MODE;
 
                 mac_mode |= GMAC_MODE;
@@ -1268,11 +1268,10 @@ static int nb8800_tangox_init(struct net_device *dev)
                 break;
 
         case PHY_INTERFACE_MODE_RGMII:
-                pad_mode = PAD_MODE_RGMII;
-                break;
-
+        case PHY_INTERFACE_MODE_RGMII_ID:
+        case PHY_INTERFACE_MODE_RGMII_RXID:
         case PHY_INTERFACE_MODE_RGMII_TXID:
-                pad_mode = PAD_MODE_RGMII | PAD_MODE_GTX_CLK_DELAY;
+                pad_mode = PAD_MODE_RGMII;
                 break;
 
         default: