|
@@ -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:
|