1 files changed, 74 insertions, 3 deletions

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 5a1bd5db2a93..0101f2bdf400 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -68,6 +68,15 @@
 #define MII_M1111_COPPER                0
 #define MII_M1111_FIBER                 1
 
+#define MII_88E1121_PHY_MSCR_PAGE       2
+#define MII_88E1121_PHY_MSCR_REG        21
+#define MII_88E1121_PHY_MSCR_RX_DELAY   BIT(5)
+#define MII_88E1121_PHY_MSCR_TX_DELAY   BIT(4)
+#define MII_88E1121_PHY_MSCR_DELAY_MASK (~(0x3 << 4))
+
+#define MII_88EC048_PHY_MSCR1_REG       16
+#define MII_88EC048_PHY_MSCR1_PAD_ODD   BIT(6)
+
 #define MII_88E1121_PHY_LED_CTRL        16
 #define MII_88E1121_PHY_LED_PAGE        3
 #define MII_88E1121_PHY_LED_DEF         0x0030
@@ -179,7 +188,30 @@ static int marvell_config_aneg(struct phy_device *phydev)
 
 static int m88e1121_config_aneg(struct phy_device *phydev)
 {
-        int err, temp;
+        int err, oldpage, mscr;
+
+        oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE);
+
+        err = phy_write(phydev, MII_88E1121_PHY_PAGE,
+                        MII_88E1121_PHY_MSCR_PAGE);
+        if (err < 0)
+                return err;
+        mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &
+                MII_88E1121_PHY_MSCR_DELAY_MASK;
+
+        if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)
+                mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
+                         MII_88E1121_PHY_MSCR_TX_DELAY);
+        else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID)
+                mscr |= MII_88E1121_PHY_MSCR_RX_DELAY;
+        else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)
+                mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;
+
+        err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
+        if (err < 0)
+                return err;
+
+        phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);
 
         err = phy_write(phydev, MII_BMCR, BMCR_RESET);
         if (err < 0)
@@ -190,17 +222,42 @@ static int m88e1121_config_aneg(struct phy_device *phydev)
         if (err < 0)
                 return err;
 
-        temp = phy_read(phydev, MII_88E1121_PHY_PAGE);
+        oldpage = 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);
+        phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);
 
         err = genphy_config_aneg(phydev);
 
         return err;
 }
 
+static int m88ec048_config_aneg(struct phy_device *phydev)
+{
+        int err, oldpage, mscr;
+
+        oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE);
+
+        err = phy_write(phydev, MII_88E1121_PHY_PAGE,
+                        MII_88E1121_PHY_MSCR_PAGE);
+        if (err < 0)
+                return err;
+
+        mscr = phy_read(phydev, MII_88EC048_PHY_MSCR1_REG);
+        mscr |= MII_88EC048_PHY_MSCR1_PAD_ODD;
+
+        err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
+        if (err < 0)
+                return err;
+
+        err = phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);
+        if (err < 0)
+                return err;
+
+        return m88e1121_config_aneg(phydev);
+}
+
 static int m88e1111_config_init(struct phy_device *phydev)
 {
         int err;
@@ -595,6 +652,19 @@ static struct phy_driver marvell_drivers[] = {
                 .driver = { .owner = THIS_MODULE },
         },
         {
+                .phy_id = MARVELL_PHY_ID_88EC048,
+                .phy_id_mask = MARVELL_PHY_ID_MASK,
+                .name = "Marvell 88EC048",
+                .features = PHY_GBIT_FEATURES,
+                .flags = PHY_HAS_INTERRUPT,
+                .config_aneg = &m88ec048_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 = MARVELL_PHY_ID_88E1145,
                 .phy_id_mask = MARVELL_PHY_ID_MASK,
                 .name = "Marvell 88E1145",
@@ -659,6 +729,7 @@ static struct mdio_device_id marvell_tbl[] = {
         { 0x01410cb0, 0xfffffff0 },
         { 0x01410cd0, 0xfffffff0 },
         { 0x01410e30, 0xfffffff0 },
+        { 0x01410e90, 0xfffffff0 },
         { }
 };