Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phylib: Use common page register definition for Marvell PHYs.

The definition of the Marvell PHY page register is not specific to
88E1121, so rename the macro to MII_MARVELL_PHY_PAGE, and use it
throughout.

Suggested-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Cyril Chemparathy <cyril@ti.com>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

David Daney and committed by
David S. Miller
27d916d6 84cf7029

+14 -13
+14 -13
drivers/net/phy/marvell.c
··· 35 35 #include <asm/irq.h> 36 36 #include <asm/uaccess.h> 37 37 38 + #define MII_MARVELL_PHY_PAGE 22 39 + 38 40 #define MII_M1011_IEVENT 0x13 39 41 #define MII_M1011_IEVENT_CLEAR 0x0000 40 42 ··· 82 80 #define MII_88E1121_PHY_LED_CTRL 16 83 81 #define MII_88E1121_PHY_LED_PAGE 3 84 82 #define MII_88E1121_PHY_LED_DEF 0x0030 85 - #define MII_88E1121_PHY_PAGE 22 86 83 87 84 #define MII_M1011_PHY_STATUS 0x11 88 85 #define MII_M1011_PHY_STATUS_1000 0x8000 ··· 191 190 { 192 191 int err, oldpage, mscr; 193 192 194 - oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE); 193 + oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE); 195 194 196 - err = phy_write(phydev, MII_88E1121_PHY_PAGE, 195 + err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 197 196 MII_88E1121_PHY_MSCR_PAGE); 198 197 if (err < 0) 199 198 return err; ··· 219 218 return err; 220 219 } 221 220 222 - phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage); 221 + phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage); 223 222 224 223 err = phy_write(phydev, MII_BMCR, BMCR_RESET); 225 224 if (err < 0) ··· 230 229 if (err < 0) 231 230 return err; 232 231 233 - oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE); 232 + oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE); 234 233 235 - phy_write(phydev, MII_88E1121_PHY_PAGE, MII_88E1121_PHY_LED_PAGE); 234 + phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_88E1121_PHY_LED_PAGE); 236 235 phy_write(phydev, MII_88E1121_PHY_LED_CTRL, MII_88E1121_PHY_LED_DEF); 237 - phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage); 236 + phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage); 238 237 239 238 err = genphy_config_aneg(phydev); 240 239 ··· 245 244 { 246 245 int err, oldpage, mscr; 247 246 248 - oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE); 247 + oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE); 249 248 250 - err = phy_write(phydev, MII_88E1121_PHY_PAGE, 249 + err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 251 250 MII_88E1121_PHY_MSCR_PAGE); 252 251 if (err < 0) 253 252 return err; ··· 259 258 if (err < 0) 260 259 return err; 261 260 262 - err = phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage); 261 + err = phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage); 263 262 if (err < 0) 264 263 return err; 265 264 ··· 399 398 int err; 400 399 401 400 /* Change address */ 402 - err = phy_write(phydev, 0x16, 0x0002); 401 + err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0002); 403 402 if (err < 0) 404 403 return err; 405 404 ··· 409 408 return err; 410 409 411 410 /* Change address */ 412 - err = phy_write(phydev, 0x16, 0x0003); 411 + err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0003); 413 412 if (err < 0) 414 413 return err; 415 414 ··· 422 421 return err; 423 422 424 423 /* Reset address */ 425 - err = phy_write(phydev, 0x16, 0x0); 424 + err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0); 426 425 if (err < 0) 427 426 return err; 428 427