net: phy: Fix mask so that we can identify Marvell 88E1518

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

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index b8b1157a0a4a19c9307bdf6a53135195407e08dd..ae870c592b679670933e869cb78fbb724d148715 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -8,6 +8,7 @@
  */
 #include <config.h>
 #include <common.h>
+#include <errno.h>
 #include <phy.h>
 
 #define PHY_AUTONEGOTIATE_TIMEOUT 5000
@@ -103,7 +104,7 @@ static int m88e1011s_config(struct phy_device *phydev)
 /* Parse the 88E1011's status register for speed and duplex
  * information
  */
-static uint m88e1xxx_parse_status(struct phy_device *phydev)
+static int m88e1xxx_parse_status(struct phy_device *phydev)
 {
        unsigned int speed;
        unsigned int mii_reg;
@@ -120,7 +121,7 @@ static uint m88e1xxx_parse_status(struct phy_device *phydev)
                        if (i > PHY_AUTONEGOTIATE_TIMEOUT) {
                                puts(" TIMEOUT !\n");
                                phydev->link = 0;
-                               break;
+                               return -ETIMEDOUT;
                        }
 
                        if ((i++ % 1000) == 0)
@@ -162,10 +163,13 @@ static uint m88e1xxx_parse_status(struct phy_device *phydev)
 
 static int m88e1011s_startup(struct phy_device *phydev)
 {
-       genphy_update_link(phydev);
-       m88e1xxx_parse_status(phydev);
+       int ret;
 
-       return 0;
+       ret = genphy_update_link(phydev);
+       if (ret)
+               return ret;
+
+       return m88e1xxx_parse_status(phydev);
 }
 
 /* Marvell 88E1111S */
@@ -349,22 +353,21 @@ static int m88e1118_config(struct phy_device *phydev)
        /* Change Page Number */
        phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x0000);
 
-       genphy_config_aneg(phydev);
-
-       phy_reset(phydev);
-
-       return 0;
+       return genphy_config_aneg(phydev);
 }
 
 static int m88e1118_startup(struct phy_device *phydev)
 {
+       int ret;
+
        /* Change Page Number */
        phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x0000);
 
-       genphy_update_link(phydev);
-       m88e1xxx_parse_status(phydev);
+       ret = genphy_update_link(phydev);
+       if (ret)
+               return ret;
 
-       return 0;
+       return m88e1xxx_parse_status(phydev);
 }
 
 /* Marvell 88E1121R */
@@ -421,12 +424,15 @@ static int m88e1145_config(struct phy_device *phydev)
 
 static int m88e1145_startup(struct phy_device *phydev)
 {
-       genphy_update_link(phydev);
+       int ret;
+
+       ret = genphy_update_link(phydev);
+       if (ret)
+               return ret;
+
        phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1145_PHY_LED_CONTROL,
                        MIIM_88E1145_PHY_LED_DIRECT);
-       m88e1xxx_parse_status(phydev);
-
-       return 0;
+       return m88e1xxx_parse_status(phydev);
 }
 
 /* Marvell 88E1149S */
@@ -471,8 +477,48 @@ static int m88e1310_config(struct phy_device *phydev)
        /* Ensure to return to page 0 */
        phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1310_PHY_PAGE, 0x0000);
 
-       genphy_config_aneg(phydev);
-       phy_reset(phydev);
+       return genphy_config_aneg(phydev);
+}
+
+static int m88e1680_config(struct phy_device *phydev)
+{
+       /*
+        * As per Marvell Release Notes - Alaska V 88E1680 Rev A2
+        * Errata Section 4.1
+        */
+       u16 reg;
+       int res;
+
+       /* Matrix LED mode (not neede if single LED mode is used */
+       phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x0004);
+       reg = phy_read(phydev, MDIO_DEVAD_NONE, 27);
+       reg |= (1 << 5);
+       phy_write(phydev, MDIO_DEVAD_NONE, 27, reg);
+
+       /* QSGMII TX amplitude change */
+       phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x00fd);
+       phy_write(phydev, MDIO_DEVAD_NONE,  8, 0x0b53);
+       phy_write(phydev, MDIO_DEVAD_NONE,  7, 0x200d);
+       phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x0000);
+
+       /* EEE initialization */
+       phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x00ff);
+       phy_write(phydev, MDIO_DEVAD_NONE, 17, 0xb030);
+       phy_write(phydev, MDIO_DEVAD_NONE, 16, 0x215c);
+       phy_write(phydev, MDIO_DEVAD_NONE, 22, 0x00fc);
+       phy_write(phydev, MDIO_DEVAD_NONE, 24, 0x888c);
+       phy_write(phydev, MDIO_DEVAD_NONE, 25, 0x888c);
+       phy_write(phydev, MDIO_DEVAD_NONE, MIIM_88E1118_PHY_PAGE, 0x0000);
+       phy_write(phydev, MDIO_DEVAD_NONE,  0, 0x9140);
+
+       res = genphy_config_aneg(phydev);
+       if (res < 0)
+               return res;
+
+       /* soft reset */
+       reg = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMCR);
+       reg |= BMCR_RESET;
+       phy_write(phydev, MDIO_DEVAD_NONE, MII_BMCR, reg);
 
        return 0;
 }
@@ -550,7 +596,7 @@ static struct phy_driver M88E1149S_driver = {
 static struct phy_driver M88E1510_driver = {
        .name = "Marvell 88E1510",
        .uid = 0x1410dd0,
-       .mask = 0xffffff0,
+       .mask = 0xfffffff,
        .features = PHY_GBIT_FEATURES,
        .config = &m88e1510_config,
        .startup = &m88e1011s_startup,
@@ -560,7 +606,7 @@ static struct phy_driver M88E1510_driver = {
 static struct phy_driver M88E1518_driver = {
        .name = "Marvell 88E1518",
        .uid = 0x1410dd1,
-       .mask = 0xffffff0,
+       .mask = 0xfffffff,
        .features = PHY_GBIT_FEATURES,
        .config = &m88e1518_config,
        .startup = &m88e1011s_startup,
@@ -577,6 +623,16 @@ static struct phy_driver M88E1310_driver = {
        .shutdown = &genphy_shutdown,
 };
 
+static struct phy_driver M88E1680_driver = {
+       .name = "Marvell 88E1680",
+       .uid = 0x1410ed0,
+       .mask = 0xffffff0,
+       .features = PHY_GBIT_FEATURES,
+       .config = &m88e1680_config,
+       .startup = &genphy_startup,
+       .shutdown = &genphy_shutdown,
+};
+
 int phy_marvell_init(void)
 {
        phy_register(&M88E1310_driver);
@@ -589,6 +645,7 @@ int phy_marvell_init(void)
        phy_register(&M88E1011S_driver);
        phy_register(&M88E1510_driver);
        phy_register(&M88E1518_driver);
+       phy_register(&M88E1680_driver);
 
        return 0;
 }