This commit allows extended Marvell registers to be read with:
foo > mdio rx FEC 3.10 Reading from bus FEC PHY at address 0: 3.16 - 0x1063 foo > mdio wx FEC 3.10 0x1011
The above code changes the way ETH connector LEDs blink.
Signed-off-by: Lukasz Majewski lukma@denx.de
---
Changes in v2: - Provide the readext and writeext callbacks to other marvell ETH PHY devices
drivers/net/phy/marvell.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index b7f300e..19f451d 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -104,6 +104,31 @@ #define MIIM_88E151x_MODE_SGMII 1 #define MIIM_88E151x_RESET_OFFS 15
+static int m88e1xxx_phy_extread(struct phy_device *phydev, int addr, + int devaddr, int regnum) +{ + int oldpage = phy_read(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE); + int val; + + phy_write(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE, devaddr); + val = phy_read(phydev, MDIO_DEVAD_NONE, regnum); + phy_write(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE, oldpage); + + return val; +} + +static int m88e1xxx_phy_extwrite(struct phy_device *phydev, int addr, + int devaddr, int regnum, u16 val) +{ + int oldpage = phy_read(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE); + + phy_write(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE, devaddr); + phy_write(phydev, MDIO_DEVAD_NONE, regnum, val); + phy_write(phydev, MDIO_DEVAD_NONE, MII_MARVELL_PHY_PAGE, oldpage); + + return 0; +} + /* Marvell 88E1011S */ static int m88e1011s_config(struct phy_device *phydev) { @@ -599,6 +624,8 @@ static struct phy_driver M88E1011S_driver = { .config = &m88e1011s_config, .startup = &m88e1011s_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
static struct phy_driver M88E1111S_driver = { @@ -609,6 +636,8 @@ static struct phy_driver M88E1111S_driver = { .config = &m88e1111s_config, .startup = &m88e1011s_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
static struct phy_driver M88E1118_driver = { @@ -619,6 +648,8 @@ static struct phy_driver M88E1118_driver = { .config = &m88e1118_config, .startup = &m88e1118_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
static struct phy_driver M88E1118R_driver = { @@ -629,6 +660,8 @@ static struct phy_driver M88E1118R_driver = { .config = &m88e1118_config, .startup = &m88e1118_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
static struct phy_driver M88E1121R_driver = { @@ -639,6 +672,8 @@ static struct phy_driver M88E1121R_driver = { .config = &m88e1121_config, .startup = &genphy_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
static struct phy_driver M88E1145_driver = { @@ -649,6 +684,8 @@ static struct phy_driver M88E1145_driver = { .config = &m88e1145_config, .startup = &m88e1145_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
static struct phy_driver M88E1149S_driver = { @@ -659,6 +696,8 @@ static struct phy_driver M88E1149S_driver = { .config = &m88e1149_config, .startup = &m88e1011s_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
static struct phy_driver M88E1510_driver = { @@ -669,6 +708,8 @@ static struct phy_driver M88E1510_driver = { .config = &m88e1510_config, .startup = &m88e1011s_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
/* @@ -684,6 +725,8 @@ static struct phy_driver M88E1518_driver = { .config = &m88e1518_config, .startup = &m88e1011s_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
static struct phy_driver M88E1310_driver = { @@ -694,6 +737,8 @@ static struct phy_driver M88E1310_driver = { .config = &m88e1310_config, .startup = &m88e1011s_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
static struct phy_driver M88E1680_driver = { @@ -704,6 +749,8 @@ static struct phy_driver M88E1680_driver = { .config = &m88e1680_config, .startup = &genphy_startup, .shutdown = &genphy_shutdown, + .readext = &m88e1xxx_phy_extread, + .writeext = &m88e1xxx_phy_extwrite, };
int phy_marvell_init(void)