Merge tag 'efi-2019-07-rc1' of git://git.denx.de/u-boot-efi

[oweals/u-boot.git] / drivers / net / phy / marvell.c

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index b05afc1ac4a9f6fcc9fc212d6eeb69f35d726f45..efbbd31ff71ba1df73a07b2be1469d58768316ca 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Marvell PHY drivers
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Copyright 2010-2011 Freescale Semiconductor, Inc.
  * author Andy Fleming
  */
-#include <config.h>
 #include <common.h>
 #include <errno.h>
 #include <phy.h>
@@ -382,7 +380,8 @@ static int m88e1518_config(struct phy_device *phydev)
 
                reg = phy_read(phydev, MDIO_DEVAD_NONE, MIIM_88E151x_PHY_MSCR);
                reg &= ~MIIM_88E151x_RGMII_RXTX_DELAY;
-               if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
+               if (phydev->interface == PHY_INTERFACE_MODE_RGMII ||
+                   phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
                        reg |= MIIM_88E151x_RGMII_RXTX_DELAY;
                else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
                        reg |= MIIM_88E151x_RGMII_RX_DELAY;