[XFS] Fix merge failures

[pandora-kernel.git] / drivers / net / phy / smsc.c

diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 25e31fb..c05d38d 100644 (file)
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -12,9 +12,10 @@
  * 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/config.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mii.h>
@@ -39,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)
@@ -49,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);
 }
 
 
@@ -74,22 +75,115 @@ 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 struct phy_driver lan911x_int_driver = {
+       .phy_id         = 0x0007c0d0, /* OUI=0x00800f, Model#=0x0d */
+       .phy_id_mask    = 0xfffffff0,
+       .name           = "SMSC LAN911x Internal PHY",
+
+       .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;
+
+       ret = phy_driver_register (&lan911x_int_driver);
+       if (ret)
+               goto err4;
+
+       return 0;
+
+err4:
+       phy_driver_unregister (&lan8700_driver);
+err3:
+       phy_driver_unregister (&lan8187_driver);
+err2:
+       phy_driver_unregister (&lan83c185_driver);
+err1:
+       return ret;
 }
 
 static void __exit smsc_exit(void)
 {
+       phy_driver_unregister (&lan911x_int_driver);
+       phy_driver_unregister (&lan8700_driver);
+       phy_driver_unregister (&lan8187_driver);
        phy_driver_unregister (&lan83c185_driver);
 }