phylib: marvell: add support for TX-only and RX-only Internal Delay

Previously, Internal Delay specification implied the delay be
applied to both TX and RX.  This patch allows for separate TX/RX-only
internal delay specification.

Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Tested-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Acked-by: Li Yang <leoli@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 17 insertions, 9 deletions

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 035fd41fb61f..f0574073a2a3 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -143,21 +143,29 @@ 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)) {
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+            (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
                 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 = phy_read(phydev, MII_M1111_PHY_EXT_CR);
+                if (temp < 0)
+                        return temp;
 
+                if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) {
                         temp |= (MII_M1111_RX_DELAY | MII_M1111_TX_DELAY);
-
-                        err = phy_write(phydev, MII_M1111_PHY_EXT_CR, temp);
-                        if (err < 0)
-                                return err;
+                } else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) {
+                        temp &= ~MII_M1111_TX_DELAY;
+                        temp |= MII_M1111_RX_DELAY;
+                } else if (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) {
+                        temp &= ~MII_M1111_RX_DELAY;
+                        temp |= 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;