Merge branch 'master' of git://git.denx.de/u-boot-samsung

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

diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index f64eb8fe04dd6df261ba33f83c0026a8bf41fdc6..41ffbe9d0ee6d67c9e640bad7b5e583db963b9fe 100644 (file)
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -7,11 +7,12 @@
  *   Copyright 2010-2011 Freescale Semiconductor, Inc.
  *   author Andy Fleming
  *
- * Some code get from linux kenrel
+ * Some code copied from linux kernel
  * Copyright (c) 2006 Herbert Valerio Riedel <hvr@gnu.org>
  */
 #include <miiphy.h>
 
+/* This code does not check the partner abilities. */
 static int smsc_parse_status(struct phy_device *phydev)
 {
        int mii_reg;
@@ -33,9 +34,13 @@ static int smsc_parse_status(struct phy_device *phydev)
 
 static int smsc_startup(struct phy_device *phydev)
 {
-       genphy_update_link(phydev);
-       smsc_parse_status(phydev);
-       return 0;
+       int ret;
+
+       ret = genphy_update_link(phydev);
+       if (ret)
+               return ret;
+
+       return smsc_parse_status(phydev);
 }
 
 static struct phy_driver lan8700_driver = {
@@ -62,9 +67,29 @@ static struct phy_driver lan8710_driver = {
        .name = "SMSC LAN8710/LAN8720",
        .uid = 0x0007c0f0,
        .mask = 0xffff0,
-       .features = PHY_GBIT_FEATURES,
+       .features = PHY_BASIC_FEATURES,
        .config = &genphy_config_aneg,
-       .startup = &smsc_startup,
+       .startup = &genphy_startup,
+       .shutdown = &genphy_shutdown,
+};
+
+static struct phy_driver lan8740_driver = {
+       .name = "SMSC LAN8740",
+       .uid = 0x0007c110,
+       .mask = 0xffff0,
+       .features = PHY_BASIC_FEATURES,
+       .config = &genphy_config_aneg,
+       .startup = &genphy_startup,
+       .shutdown = &genphy_shutdown,
+};
+
+static struct phy_driver lan8742_driver = {
+       .name = "SMSC LAN8742",
+       .uid = 0x0007c130,
+       .mask = 0xffff0,
+       .features = PHY_BASIC_FEATURES,
+       .config = &genphy_config_aneg,
+       .startup = &genphy_startup,
        .shutdown = &genphy_shutdown,
 };
 
@@ -73,6 +98,8 @@ int phy_smsc_init(void)
        phy_register(&lan8710_driver);
        phy_register(&lan911x_driver);
        phy_register(&lan8700_driver);
+       phy_register(&lan8740_driver);
+       phy_register(&lan8742_driver);
 
        return 0;
 }