aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/cortina/gemini.c')
-rw-r--r--drivers/net/ethernet/cortina/gemini.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/ethernet/cortina/gemini.c b/drivers/net/ethernet/cortina/gemini.c
index 5242687060b4..f8a3d1fecb0a 100644
--- a/drivers/net/ethernet/cortina/gemini.c
+++ b/drivers/net/ethernet/cortina/gemini.c
@@ -304,21 +304,21 @@ static void gmac_speed_set(struct net_device *netdev)
304 switch (phydev->speed) { 304 switch (phydev->speed) {
305 case 1000: 305 case 1000:
306 status.bits.speed = GMAC_SPEED_1000; 306 status.bits.speed = GMAC_SPEED_1000;
307 if (phydev->interface == PHY_INTERFACE_MODE_RGMII) 307 if (phy_interface_mode_is_rgmii(phydev->interface))
308 status.bits.mii_rmii = GMAC_PHY_RGMII_1000; 308 status.bits.mii_rmii = GMAC_PHY_RGMII_1000;
309 netdev_dbg(netdev, "connect %s to RGMII @ 1Gbit\n", 309 netdev_dbg(netdev, "connect %s to RGMII @ 1Gbit\n",
310 phydev_name(phydev)); 310 phydev_name(phydev));
311 break; 311 break;
312 case 100: 312 case 100:
313 status.bits.speed = GMAC_SPEED_100; 313 status.bits.speed = GMAC_SPEED_100;
314 if (phydev->interface == PHY_INTERFACE_MODE_RGMII) 314 if (phy_interface_mode_is_rgmii(phydev->interface))
315 status.bits.mii_rmii = GMAC_PHY_RGMII_100_10; 315 status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
316 netdev_dbg(netdev, "connect %s to RGMII @ 100 Mbit\n", 316 netdev_dbg(netdev, "connect %s to RGMII @ 100 Mbit\n",
317 phydev_name(phydev)); 317 phydev_name(phydev));
318 break; 318 break;
319 case 10: 319 case 10:
320 status.bits.speed = GMAC_SPEED_10; 320 status.bits.speed = GMAC_SPEED_10;
321 if (phydev->interface == PHY_INTERFACE_MODE_RGMII) 321 if (phy_interface_mode_is_rgmii(phydev->interface))
322 status.bits.mii_rmii = GMAC_PHY_RGMII_100_10; 322 status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;
323 netdev_dbg(netdev, "connect %s to RGMII @ 10 Mbit\n", 323 netdev_dbg(netdev, "connect %s to RGMII @ 10 Mbit\n",
324 phydev_name(phydev)); 324 phydev_name(phydev));
@@ -389,6 +389,9 @@ static int gmac_setup_phy(struct net_device *netdev)
389 status.bits.mii_rmii = GMAC_PHY_GMII; 389 status.bits.mii_rmii = GMAC_PHY_GMII;
390 break; 390 break;
391 case PHY_INTERFACE_MODE_RGMII: 391 case PHY_INTERFACE_MODE_RGMII:
392 case PHY_INTERFACE_MODE_RGMII_ID:
393 case PHY_INTERFACE_MODE_RGMII_TXID:
394 case PHY_INTERFACE_MODE_RGMII_RXID:
392 netdev_dbg(netdev, 395 netdev_dbg(netdev,
393 "RGMII: set GMAC0 and GMAC1 to MII/RGMII mode\n"); 396 "RGMII: set GMAC0 and GMAC1 to MII/RGMII mode\n");
394 status.bits.mii_rmii = GMAC_PHY_RGMII_100_10; 397 status.bits.mii_rmii = GMAC_PHY_RGMII_100_10;