Merge master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / drivers / net / phy / marvell.c

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 22aec5cce68310ab6e4128b2ec30435fcff5c375..d2ede5ff9fffc5e70136207738c7fada30ca31e4 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -54,6 +54,13 @@
 #define MII_M1111_PHY_LED_CONTROL      0x18
 #define MII_M1111_PHY_LED_DIRECT       0x4100
 #define MII_M1111_PHY_LED_COMBINE      0x411c
+#define MII_M1111_PHY_EXT_CR           0x14
+#define MII_M1111_RX_DELAY             0x80
+#define MII_M1111_TX_DELAY             0x2
+#define MII_M1111_PHY_EXT_SR           0x1b
+#define MII_M1111_HWCFG_MODE_MASK      0xf
+#define MII_M1111_HWCFG_MODE_RGMII     0xb
+#define MII_M1111_HWCFG_MODE_SGMII_NO_CLK      0x4
 
 MODULE_DESCRIPTION("Marvell PHY driver");
 MODULE_AUTHOR("Andy Fleming");
@@ -131,6 +138,60 @@ static int marvell_config_aneg(struct phy_device *phydev)
        return err;
 }
 
+static int m88e1111_config_init(struct phy_device *phydev)
+{
+       int err;
+
+       if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
+           (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)) {
+               int temp;
+
+               if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
+                       temp = phy_read(phydev, MII_M1111_PHY_EXT_CR);
+                       if (temp < 0)
+                               return temp;
+
+                       temp |= (MII_M1111_RX_DELAY | MII_M1111_TX_DELAY);
+
+                       err = phy_write(phydev, MII_M1111_PHY_EXT_CR, temp);
+                       if (err < 0)
+                               return err;
+               }
+
+               temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
+               if (temp < 0)
+                       return temp;
+
+               temp &= ~(MII_M1111_HWCFG_MODE_MASK);
+               temp |= MII_M1111_HWCFG_MODE_RGMII;
+
+               err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
+               if (err < 0)
+                       return err;
+       }
+
+       if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {
+               int temp;
+
+               temp = phy_read(phydev, MII_M1111_PHY_EXT_SR);
+               if (temp < 0)
+                       return temp;
+
+               temp &= ~(MII_M1111_HWCFG_MODE_MASK);
+               temp |= MII_M1111_HWCFG_MODE_SGMII_NO_CLK;
+
+               err = phy_write(phydev, MII_M1111_PHY_EXT_SR, temp);
+               if (err < 0)
+                       return err;
+       }
+
+       err = phy_write(phydev, MII_BMCR, BMCR_RESET);
+       if (err < 0)
+               return err;
+
+       return 0;
+}
+
 static int m88e1145_config_init(struct phy_device *phydev)
 {
        int err;
@@ -152,7 +213,7 @@ static int m88e1145_config_init(struct phy_device *phydev)
        if (err < 0)
                return err;
 
-       if (phydev->interface == PHY_INTERFACE_MODE_RGMII) {
+       if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
                int temp = phy_read(phydev, MII_M1145_PHY_EXT_CR);
                if (temp < 0)
                        return temp;
@@ -193,76 +254,84 @@ static int m88e1145_config_init(struct phy_device *phydev)
        return 0;
 }
 
-static struct phy_driver m88e1101_driver = {
-       .phy_id = 0x01410c60,
-       .phy_id_mask = 0xfffffff0,
-       .name = "Marvell 88E1101",
-       .features = PHY_GBIT_FEATURES,
-       .flags = PHY_HAS_INTERRUPT,
-       .config_aneg = &marvell_config_aneg,
-       .read_status = &genphy_read_status,
-       .ack_interrupt = &marvell_ack_interrupt,
-       .config_intr = &marvell_config_intr,
-       .driver = {.owner = THIS_MODULE,},
-};
-
-static struct phy_driver m88e1111s_driver = {
-       .phy_id = 0x01410cc0,
-       .phy_id_mask = 0xfffffff0,
-       .name = "Marvell 88E1111",
-       .features = PHY_GBIT_FEATURES,
-       .flags = PHY_HAS_INTERRUPT,
-       .config_aneg = &marvell_config_aneg,
-       .read_status = &genphy_read_status,
-       .ack_interrupt = &marvell_ack_interrupt,
-       .config_intr = &marvell_config_intr,
-       .driver = {.owner = THIS_MODULE,},
-};
-
-static struct phy_driver m88e1145_driver = {
-       .phy_id = 0x01410cd0,
-       .phy_id_mask = 0xfffffff0,
-       .name = "Marvell 88E1145",
-       .features = PHY_GBIT_FEATURES,
-       .flags = PHY_HAS_INTERRUPT,
-       .config_init = &m88e1145_config_init,
-       .config_aneg = &marvell_config_aneg,
-       .read_status = &genphy_read_status,
-       .ack_interrupt = &marvell_ack_interrupt,
-       .config_intr = &marvell_config_intr,
-       .driver = {.owner = THIS_MODULE,},
+static struct phy_driver marvell_drivers[] = {
+       {
+               .phy_id = 0x01410c60,
+               .phy_id_mask = 0xfffffff0,
+               .name = "Marvell 88E1101",
+               .features = PHY_GBIT_FEATURES,
+               .flags = PHY_HAS_INTERRUPT,
+               .config_aneg = &marvell_config_aneg,
+               .read_status = &genphy_read_status,
+               .ack_interrupt = &marvell_ack_interrupt,
+               .config_intr = &marvell_config_intr,
+               .driver = {.owner = THIS_MODULE,},
+       },
+       {
+               .phy_id = 0x01410c90,
+               .phy_id_mask = 0xfffffff0,
+               .name = "Marvell 88E1112",
+               .features = PHY_GBIT_FEATURES,
+               .flags = PHY_HAS_INTERRUPT,
+               .config_init = &m88e1111_config_init,
+               .config_aneg = &marvell_config_aneg,
+               .read_status = &genphy_read_status,
+               .ack_interrupt = &marvell_ack_interrupt,
+               .config_intr = &marvell_config_intr,
+               .driver = {.owner = THIS_MODULE,},
+       },
+       {
+               .phy_id = 0x01410cc0,
+               .phy_id_mask = 0xfffffff0,
+               .name = "Marvell 88E1111",
+               .features = PHY_GBIT_FEATURES,
+               .flags = PHY_HAS_INTERRUPT,
+               .config_init = &m88e1111_config_init,
+               .config_aneg = &marvell_config_aneg,
+               .read_status = &genphy_read_status,
+               .ack_interrupt = &marvell_ack_interrupt,
+               .config_intr = &marvell_config_intr,
+               .driver = {.owner = THIS_MODULE,},
+       },
+       {
+               .phy_id = 0x01410cd0,
+               .phy_id_mask = 0xfffffff0,
+               .name = "Marvell 88E1145",
+               .features = PHY_GBIT_FEATURES,
+               .flags = PHY_HAS_INTERRUPT,
+               .config_init = &m88e1145_config_init,
+               .config_aneg = &marvell_config_aneg,
+               .read_status = &genphy_read_status,
+               .ack_interrupt = &marvell_ack_interrupt,
+               .config_intr = &marvell_config_intr,
+               .driver = {.owner = THIS_MODULE,},
+       }
 };
 
 static int __init marvell_init(void)
 {
        int ret;
+       int i;
 
-       ret = phy_driver_register(&m88e1101_driver);
-       if (ret)
-               return ret;
+       for (i = 0; i < ARRAY_SIZE(marvell_drivers); i++) {
+               ret = phy_driver_register(&marvell_drivers[i]);
 
-       ret = phy_driver_register(&m88e1111s_driver);
-       if (ret)
-               goto err1111s;
-
-       ret = phy_driver_register(&m88e1145_driver);
-       if (ret)
-               goto err1145;
+               if (ret) {
+                       while (i-- > 0)
+                               phy_driver_unregister(&marvell_drivers[i]);
+                       return ret;
+               }
+       }
 
        return 0;
-
-      err1145:
-       phy_driver_unregister(&m88e1111s_driver);
-      err1111s:
-       phy_driver_unregister(&m88e1101_driver);
-       return ret;
 }
 
 static void __exit marvell_exit(void)
 {
-       phy_driver_unregister(&m88e1101_driver);
-       phy_driver_unregister(&m88e1111s_driver);
-       phy_driver_unregister(&m88e1145_driver);
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(marvell_drivers); i++)
+               phy_driver_unregister(&marvell_drivers[i]);
 }
 
 module_init(marvell_init);