phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr

[net-next-2.6.git] / drivers / net / phy / marvell.c

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 0101f2bdf400e7b28eca39d0c9b7a413e2f0d326..f0bd1a1aba3ab3413a16eab296b4881d99ea1145 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -74,8 +74,8 @@
 #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_88E1318S_PHY_MSCR1_REG     16
+#define MII_88E1318S_PHY_MSCR1_PAD_ODD BIT(6)
 
 #define MII_88E1121_PHY_LED_CTRL       16
 #define MII_88E1121_PHY_LED_PAGE       3
@@ -196,20 +196,27 @@ static int m88e1121_config_aneg(struct phy_device *phydev)
                        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;
+
+       if ((phydev->interface == PHY_INTERFACE_MODE_RGMII) ||
+           (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID) ||
+           (phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) ||
+           (phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID)) {
+
+               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);
 
@@ -233,7 +240,7 @@ static int m88e1121_config_aneg(struct phy_device *phydev)
        return err;
 }
 
-static int m88ec048_config_aneg(struct phy_device *phydev)
+static int m88e1318_config_aneg(struct phy_device *phydev)
 {
        int err, oldpage, mscr;
 
@@ -244,10 +251,10 @@ static int m88ec048_config_aneg(struct phy_device *phydev)
        if (err < 0)
                return err;
 
-       mscr = phy_read(phydev, MII_88EC048_PHY_MSCR1_REG);
-       mscr |= MII_88EC048_PHY_MSCR1_PAD_ODD;
+       mscr = phy_read(phydev, MII_88E1318S_PHY_MSCR1_REG);
+       mscr |= MII_88E1318S_PHY_MSCR1_PAD_ODD;
 
-       err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);
+       err = phy_write(phydev, MII_88E1318S_PHY_MSCR1_REG, mscr);
        if (err < 0)
                return err;
 
@@ -652,12 +659,12 @@ static struct phy_driver marvell_drivers[] = {
                .driver = { .owner = THIS_MODULE },
        },
        {
-               .phy_id = MARVELL_PHY_ID_88EC048,
+               .phy_id = MARVELL_PHY_ID_88E1318S,
                .phy_id_mask = MARVELL_PHY_ID_MASK,
-               .name = "Marvell 88EC048",
+               .name = "Marvell 88E1318S",
                .features = PHY_GBIT_FEATURES,
                .flags = PHY_HAS_INTERRUPT,
-               .config_aneg = &m88ec048_config_aneg,
+               .config_aneg = &m88e1318_config_aneg,
                .read_status = &marvell_read_status,
                .ack_interrupt = &marvell_ack_interrupt,
                .config_intr = &marvell_config_intr,
@@ -721,7 +728,7 @@ static void __exit marvell_exit(void)
 module_init(marvell_init);
 module_exit(marvell_exit);
 
-static struct mdio_device_id marvell_tbl[] = {
+static struct mdio_device_id __maybe_unused marvell_tbl[] = {
        { 0x01410c60, 0xfffffff0 },
        { 0x01410c90, 0xfffffff0 },
        { 0x01410cc0, 0xfffffff0 },