SPDX: Convert all of our single license tags to Linux Kernel style

[u-boot] / drivers / net / phy / atheros.c

diff --git a/drivers/net/phy/atheros.c b/drivers/net/phy/atheros.c
index 32c2ab9944e1dfd15cf2153a55c9035d7444589c..79f68af14c0c262dab89bf0ea323d848a72fcd04 100644 (file)
--- a/drivers/net/phy/atheros.c
+++ b/drivers/net/phy/atheros.c
@@ -1,18 +1,54 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Atheros PHY drivers
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Copyright 2011, 2013 Freescale Semiconductor, Inc.
  * author Andy Fleming
  */
 #include <phy.h>
 
+#define AR803x_PHY_DEBUG_ADDR_REG      0x1d
+#define AR803x_PHY_DEBUG_DATA_REG      0x1e
+
+#define AR803x_DEBUG_REG_5             0x5
+#define AR803x_RGMII_TX_CLK_DLY                0x100
+
+#define AR803x_DEBUG_REG_0             0x0
+#define AR803x_RGMII_RX_CLK_DLY                0x8000
+
 static int ar8021_config(struct phy_device *phydev)
 {
+       phy_write(phydev, MDIO_DEVAD_NONE, 0x00, 0x1200);
        phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x05);
        phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, 0x3D47);
 
+       phydev->supported = phydev->drv->features;
+       return 0;
+}
+
+static int ar8031_config(struct phy_device *phydev)
+{
+       if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID ||
+           phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
+               phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_ADDR_REG,
+                         AR803x_DEBUG_REG_5);
+               phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_DATA_REG,
+                         AR803x_RGMII_TX_CLK_DLY);
+       }
+
+       if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID ||
+           phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
+               phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_ADDR_REG,
+                         AR803x_DEBUG_REG_0);
+               phy_write(phydev, MDIO_DEVAD_NONE, AR803x_PHY_DEBUG_DATA_REG,
+                         AR803x_RGMII_RX_CLK_DLY);
+       }
+
+       phydev->supported = phydev->drv->features;
+
+       genphy_config_aneg(phydev);
+       genphy_restart_aneg(phydev);
+
        return 0;
 }
 
@@ -30,9 +66,26 @@ static int ar8035_config(struct phy_device *phydev)
        regval = phy_read(phydev, MDIO_DEVAD_NONE, 0x1e);
        phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, (regval|0x0100));
 
-       genphy_config_aneg(phydev);
+       if ((phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+           (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
+               /* select debug reg 5 */
+               phy_write(phydev, MDIO_DEVAD_NONE, 0x1D, 0x5);
+               /* enable tx delay */
+               phy_write(phydev, MDIO_DEVAD_NONE, 0x1E, 0x0100);
+       }
 
-       phy_reset(phydev);
+       if ((phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+           (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)) {
+               /* select debug reg 0 */
+               phy_write(phydev, MDIO_DEVAD_NONE, 0x1D, 0x0);
+               /* enable rx delay */
+               phy_write(phydev, MDIO_DEVAD_NONE, 0x1E, 0x8000);
+       }
+
+       phydev->supported = phydev->drv->features;
+
+       genphy_config_aneg(phydev);
+       genphy_restart_aneg(phydev);
 
        return 0;
 }
@@ -40,7 +93,7 @@ static int ar8035_config(struct phy_device *phydev)
 static struct phy_driver AR8021_driver =  {
        .name = "AR8021",
        .uid = 0x4dd040,
-       .mask = 0x4fffff,
+       .mask = 0x4ffff0,
        .features = PHY_GBIT_FEATURES,
        .config = ar8021_config,
        .startup = genphy_startup,
@@ -52,7 +105,7 @@ static struct phy_driver AR8031_driver =  {
        .uid = 0x4dd074,
        .mask = 0xffffffef,
        .features = PHY_GBIT_FEATURES,
-       .config = ar8021_config,
+       .config = ar8031_config,
        .startup = genphy_startup,
        .shutdown = genphy_shutdown,
 };