Commit 337ac9d5218cc19f40fca13fa4deb3c658c4241b
Committed by
David S. Miller
David S. Miller
1 parent
a4765fa7bf
Exists in
master
and in
7 other branches
phy/marvell: rename 88ec048 to 88e1318s and fix mscr1 addr
The marvell 88ec048's official part number is 88e1318s. This patch renames definitions in the driver to reflect this. In addition, a minor bug fix has been added to write back the MSCR1 register value properly. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Showing 2 changed files with 10 additions and 10 deletions Side-by-side Diff
drivers/net/phy/marvell.c
| ... | ... | @@ -74,8 +74,8 @@ |
| 74 | 74 | #define MII_88E1121_PHY_MSCR_TX_DELAY BIT(4) |
| 75 | 75 | #define MII_88E1121_PHY_MSCR_DELAY_MASK (~(0x3 << 4)) |
| 76 | 76 | |
| 77 | -#define MII_88EC048_PHY_MSCR1_REG 16 | |
| 78 | -#define MII_88EC048_PHY_MSCR1_PAD_ODD BIT(6) | |
| 77 | +#define MII_88E1318S_PHY_MSCR1_REG 16 | |
| 78 | +#define MII_88E1318S_PHY_MSCR1_PAD_ODD BIT(6) | |
| 79 | 79 | |
| 80 | 80 | #define MII_88E1121_PHY_LED_CTRL 16 |
| 81 | 81 | #define MII_88E1121_PHY_LED_PAGE 3 |
| ... | ... | @@ -240,7 +240,7 @@ |
| 240 | 240 | return err; |
| 241 | 241 | } |
| 242 | 242 | |
| 243 | -static int m88ec048_config_aneg(struct phy_device *phydev) | |
| 243 | +static int m88e1318_config_aneg(struct phy_device *phydev) | |
| 244 | 244 | { |
| 245 | 245 | int err, oldpage, mscr; |
| 246 | 246 | |
| 247 | 247 | |
| ... | ... | @@ -251,10 +251,10 @@ |
| 251 | 251 | if (err < 0) |
| 252 | 252 | return err; |
| 253 | 253 | |
| 254 | - mscr = phy_read(phydev, MII_88EC048_PHY_MSCR1_REG); | |
| 255 | - mscr |= MII_88EC048_PHY_MSCR1_PAD_ODD; | |
| 254 | + mscr = phy_read(phydev, MII_88E1318S_PHY_MSCR1_REG); | |
| 255 | + mscr |= MII_88E1318S_PHY_MSCR1_PAD_ODD; | |
| 256 | 256 | |
| 257 | - err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr); | |
| 257 | + err = phy_write(phydev, MII_88E1318S_PHY_MSCR1_REG, mscr); | |
| 258 | 258 | if (err < 0) |
| 259 | 259 | return err; |
| 260 | 260 | |
| 261 | 261 | |
| 262 | 262 | |
| ... | ... | @@ -659,12 +659,12 @@ |
| 659 | 659 | .driver = { .owner = THIS_MODULE }, |
| 660 | 660 | }, |
| 661 | 661 | { |
| 662 | - .phy_id = MARVELL_PHY_ID_88EC048, | |
| 662 | + .phy_id = MARVELL_PHY_ID_88E1318S, | |
| 663 | 663 | .phy_id_mask = MARVELL_PHY_ID_MASK, |
| 664 | - .name = "Marvell 88EC048", | |
| 664 | + .name = "Marvell 88E1318S", | |
| 665 | 665 | .features = PHY_GBIT_FEATURES, |
| 666 | 666 | .flags = PHY_HAS_INTERRUPT, |
| 667 | - .config_aneg = &m88ec048_config_aneg, | |
| 667 | + .config_aneg = &m88e1318_config_aneg, | |
| 668 | 668 | .read_status = &marvell_read_status, |
| 669 | 669 | .ack_interrupt = &marvell_ack_interrupt, |
| 670 | 670 | .config_intr = &marvell_config_intr, |
include/linux/marvell_phy.h
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | #define MARVELL_PHY_ID_88E1121R 0x01410cb0 |
| 13 | 13 | #define MARVELL_PHY_ID_88E1145 0x01410cd0 |
| 14 | 14 | #define MARVELL_PHY_ID_88E1240 0x01410e30 |
| 15 | -#define MARVELL_PHY_ID_88EC048 0x01410e90 | |
| 15 | +#define MARVELL_PHY_ID_88E1318S 0x01410e90 | |
| 16 | 16 | |
| 17 | 17 | /* struct phy_device dev_flags definitions */ |
| 18 | 18 | #define MARVELL_PHY_M1145_FLAGS_RESISTANCE 0x00000001 |