3 files changed, 68 insertions, 5 deletions

diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c
index cf24cc34debe..e7070515d2e3 100644
--- a/drivers/net/phy/fixed.c
+++ b/drivers/net/phy/fixed.c
@@ -19,6 +19,7 @@
 #include <linux/mii.h>
 #include <linux/phy.h>
 #include <linux/phy_fixed.h>
+#include <linux/err.h>
 
 #define MII_REGS_NUM 29
 
@@ -207,8 +208,8 @@ static int __init fixed_mdio_bus_init(void)
         int ret;
 
         pdev = platform_device_register_simple("Fixed MDIO bus", 0, NULL, 0);
-        if (!pdev) {
-                ret = -ENOMEM;
+        if (IS_ERR(pdev)) {
+                ret = PTR_ERR(pdev);
                 goto err_pdev;
         }
 
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index eb6411c4694f..7a3ec9d39a9a 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -69,6 +69,11 @@
 #define MII_M1111_COPPER                0
 #define MII_M1111_FIBER                 1
 
+#define MII_88E1121_PHY_LED_CTRL        16
+#define MII_88E1121_PHY_LED_PAGE        3
+#define MII_88E1121_PHY_LED_DEF         0x0030
+#define MII_88E1121_PHY_PAGE            22
+
 #define MII_M1011_PHY_STATUS            0x11
 #define MII_M1011_PHY_STATUS_1000       0x8000
 #define MII_M1011_PHY_STATUS_100        0x4000
@@ -154,6 +159,30 @@ static int marvell_config_aneg(struct phy_device *phydev)
         return err;
 }
 
+static int m88e1121_config_aneg(struct phy_device *phydev)
+{
+        int err, temp;
+
+        err = phy_write(phydev, MII_BMCR, BMCR_RESET);
+        if (err < 0)
+                return err;
+
+        err = phy_write(phydev, MII_M1011_PHY_SCR,
+                        MII_M1011_PHY_SCR_AUTO_CROSS);
+        if (err < 0)
+                return err;
+
+        temp = phy_read(phydev, MII_88E1121_PHY_PAGE);
+
+        phy_write(phydev, MII_88E1121_PHY_PAGE, MII_88E1121_PHY_LED_PAGE);
+        phy_write(phydev, MII_88E1121_PHY_LED_CTRL, MII_88E1121_PHY_LED_DEF);
+        phy_write(phydev, MII_88E1121_PHY_PAGE, temp);
+
+        err = genphy_config_aneg(phydev);
+
+        return err;
+}
+
 static int m88e1111_config_init(struct phy_device *phydev)
 {
         int err;
@@ -429,6 +458,18 @@ static int marvell_read_status(struct phy_device *phydev)
         return 0;
 }
 
+static int m88e1121_did_interrupt(struct phy_device *phydev)
+{
+        int imask;
+
+        imask = phy_read(phydev, MII_M1011_IEVENT);
+
+        if (imask & MII_M1011_IMASK_INIT)
+                return 1;
+
+        return 0;
+}
+
 static struct phy_driver marvell_drivers[] = {
         {
                 .phy_id = 0x01410c60,
@@ -482,6 +523,19 @@ static struct phy_driver marvell_drivers[] = {
                 .driver = {.owner = THIS_MODULE,},
         },
         {
+                .phy_id = 0x01410cb0,
+                .phy_id_mask = 0xfffffff0,
+                .name = "Marvell 88E1121R",
+                .features = PHY_GBIT_FEATURES,
+                .flags = PHY_HAS_INTERRUPT,
+                .config_aneg = &m88e1121_config_aneg,
+                .read_status = &marvell_read_status,
+                .ack_interrupt = &marvell_ack_interrupt,
+                .config_intr = &marvell_config_intr,
+                .did_interrupt = &m88e1121_did_interrupt,
+                .driver = { .owner = THIS_MODULE },
+        },
+        {
                 .phy_id = 0x01410cd0,
                 .phy_id_mask = 0xfffffff0,
                 .name = "Marvell 88E1145",
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 3ff1f425f1bb..61755cbd978e 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -434,7 +434,7 @@ void phy_start_machine(struct phy_device *phydev,
         phydev->adjust_state = handler;
 
         INIT_DELAYED_WORK(&phydev->state_queue, phy_state_machine);
-        schedule_delayed_work(&phydev->state_queue, jiffies + HZ);
+        schedule_delayed_work(&phydev->state_queue, HZ);
 }
 
 /**
@@ -655,6 +655,10 @@ static void phy_change(struct work_struct *work)
         struct phy_device *phydev =
                 container_of(work, struct phy_device, phy_queue);
 
+        if (phydev->drv->did_interrupt &&
+            !phydev->drv->did_interrupt(phydev))
+                goto ignore;
+
         err = phy_disable_interrupts(phydev);
 
         if (err)
@@ -681,6 +685,11 @@ static void phy_change(struct work_struct *work)
 
         return;
 
+ignore:
+        atomic_dec(&phydev->irq_disable);
+        enable_irq(phydev->irq);
+        return;
+
 irq_enable_err:
         disable_irq(phydev->irq);
         atomic_inc(&phydev->irq_disable);
@@ -937,6 +946,5 @@ static void phy_state_machine(struct work_struct *work)
         if (err < 0)
                 phy_error(phydev);
 
-        schedule_delayed_work(&phydev->state_queue,
-                                jiffies + PHY_STATE_TIME * HZ);
+        schedule_delayed_work(&phydev->state_queue, PHY_STATE_TIME * HZ);
 }