3 files changed, 77 insertions, 10 deletions

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 3ac8529bb92c..6bf9e76b0a00 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -48,7 +48,7 @@ config VITESSE_PHY
 config SMSC_PHY
         tristate "Drivers for SMSC PHYs"
         ---help---
-          Currently supports the LAN83C185 PHY
+          Currently supports the LAN83C185, LAN8187 and LAN8700 PHYs
 
 config BROADCOM_PHY
         tristate "Drivers for Broadcom PHYs"
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index ddf8d51832a6..ac3c01d28fdf 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -256,7 +256,7 @@ void phy_prepare_link(struct phy_device *phydev,
 /**
  * phy_connect - connect an ethernet device to a PHY device
  * @dev: the network device to connect
- * @phy_id: the PHY device to connect
+ * @bus_id: the id string of the PHY device to connect
  * @handler: callback function for state change notifications
  * @flags: PHY device's dev_flags
  * @interface: PHY device's interface
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index b1d8ed40ad98..73baa7a3bb0e 100644
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -12,6 +12,8 @@
  * Free Software Foundation;  either version 2 of the  License, or (at your
  * option) any later version.
  *
+ * Support added for SMSC LAN8187 and LAN8700 by steve.glendinning@smsc.com
+ *
  */
 
 #include <linux/kernel.h>
@@ -38,7 +40,7 @@
         (MII_LAN83C185_ISF_INT6 | MII_LAN83C185_ISF_INT4)
 
 
-static int lan83c185_config_intr(struct phy_device *phydev)
+static int smsc_phy_config_intr(struct phy_device *phydev)
 {
         int rc = phy_write (phydev, MII_LAN83C185_IM,
                         ((PHY_INTERRUPT_ENABLED == phydev->interrupts)
@@ -48,16 +50,16 @@ static int lan83c185_config_intr(struct phy_device *phydev)
         return rc < 0 ? rc : 0;
 }
 
-static int lan83c185_ack_interrupt(struct phy_device *phydev)
+static int smsc_phy_ack_interrupt(struct phy_device *phydev)
 {
         int rc = phy_read (phydev, MII_LAN83C185_ISF);
 
         return rc < 0 ? rc : 0;
 }
 
-static int lan83c185_config_init(struct phy_device *phydev)
+static int smsc_phy_config_init(struct phy_device *phydev)
 {
-        return lan83c185_ack_interrupt (phydev);
+        return smsc_phy_ack_interrupt (phydev);
 }
 
 
@@ -73,22 +75,87 @@ static struct phy_driver lan83c185_driver = {
         /* basic functions */
         .config_aneg    = genphy_config_aneg,
         .read_status    = genphy_read_status,
-        .config_init    = lan83c185_config_init,
+        .config_init    = smsc_phy_config_init,
 
         /* IRQ related */
-        .ack_interrupt  = lan83c185_ack_interrupt,
-        .config_intr    = lan83c185_config_intr,
+        .ack_interrupt  = smsc_phy_ack_interrupt,
+        .config_intr    = smsc_phy_config_intr,
+
+        .driver         = { .owner = THIS_MODULE, }
+};
+
+static struct phy_driver lan8187_driver = {
+        .phy_id         = 0x0007c0b0, /* OUI=0x00800f, Model#=0x0b */
+        .phy_id_mask    = 0xfffffff0,
+        .name           = "SMSC LAN8187",
+
+        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause
+                                | SUPPORTED_Asym_Pause),
+        .flags          = PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG,
+
+        /* basic functions */
+        .config_aneg    = genphy_config_aneg,
+        .read_status    = genphy_read_status,
+        .config_init    = smsc_phy_config_init,
+
+        /* IRQ related */
+        .ack_interrupt  = smsc_phy_ack_interrupt,
+        .config_intr    = smsc_phy_config_intr,
+
+        .driver         = { .owner = THIS_MODULE, }
+};
+
+static struct phy_driver lan8700_driver = {
+        .phy_id         = 0x0007c0c0, /* OUI=0x00800f, Model#=0x0c */
+        .phy_id_mask    = 0xfffffff0,
+        .name           = "SMSC LAN8700",
+
+        .features       = (PHY_BASIC_FEATURES | SUPPORTED_Pause
+                                | SUPPORTED_Asym_Pause),
+        .flags          = PHY_HAS_INTERRUPT | PHY_HAS_MAGICANEG,
+
+        /* basic functions */
+        .config_aneg    = genphy_config_aneg,
+        .read_status    = genphy_read_status,
+        .config_init    = smsc_phy_config_init,
+
+        /* IRQ related */
+        .ack_interrupt  = smsc_phy_ack_interrupt,
+        .config_intr    = smsc_phy_config_intr,
 
         .driver         = { .owner = THIS_MODULE, }
 };
 
 static int __init smsc_init(void)
 {
-        return phy_driver_register (&lan83c185_driver);
+        int ret;
+
+        ret = phy_driver_register (&lan83c185_driver);
+        if (ret)
+                goto err1;
+
+        ret = phy_driver_register (&lan8187_driver);
+        if (ret)
+                goto err2;
+
+        ret = phy_driver_register (&lan8700_driver);
+        if (ret)
+                goto err3;
+
+        return 0;
+
+err3:
+        phy_driver_unregister (&lan8187_driver);
+err2:
+        phy_driver_unregister (&lan83c185_driver);
+err1:
+        return ret;
 }
 
 static void __exit smsc_exit(void)
 {
+        phy_driver_unregister (&lan8700_driver);
+        phy_driver_unregister (&lan8187_driver);
         phy_driver_unregister (&lan83c185_driver);
 }