Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d916d6 authored by David Daney's avatar David Daney Committed by David S. Miller
Browse files

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: default avatarCyril Chemparathy <cyril@ti.com>
Signed-off-by: default avatarDavid 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: default avatarDavid S. Miller <davem@davemloft.net>
parent 84cf7029

drivers/net/phy/marvell.c

+14 −13
Original line number Original line Diff line number Diff line
@@ -35,6 +35,8 @@ 
#include <asm/irq.h>

#include <asm/irq.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>





#define MII_MARVELL_PHY_PAGE		22



#define MII_M1011_IEVENT		0x13

#define MII_M1011_IEVENT		0x13

#define MII_M1011_IEVENT_CLEAR		0x0000

#define MII_M1011_IEVENT_CLEAR		0x0000
@@ -80,7 +82,6 @@ 
#define MII_88E1121_PHY_LED_CTRL	16

#define MII_88E1121_PHY_LED_CTRL	16

#define MII_88E1121_PHY_LED_PAGE	3

#define MII_88E1121_PHY_LED_PAGE	3

#define MII_88E1121_PHY_LED_DEF		0x0030

#define MII_88E1121_PHY_LED_DEF		0x0030

#define MII_88E1121_PHY_PAGE		22





#define MII_M1011_PHY_STATUS		0x11

#define MII_M1011_PHY_STATUS		0x11

#define MII_M1011_PHY_STATUS_1000	0x8000

#define MII_M1011_PHY_STATUS_1000	0x8000
@@ -190,9 +191,9 @@ static int m88e1121_config_aneg(struct phy_device *phydev) 
{

{

	int err, oldpage, mscr;

	int err, oldpage, mscr;





	oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE);

	oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE);





	err = phy_write(phydev, MII_88E1121_PHY_PAGE,

	err = phy_write(phydev, MII_MARVELL_PHY_PAGE,

			MII_88E1121_PHY_MSCR_PAGE);

			MII_88E1121_PHY_MSCR_PAGE);

	if (err < 0)

	if (err < 0)

		return err;

		return err;
@@ -218,7 +219,7 @@ static int m88e1121_config_aneg(struct phy_device *phydev) 
			return err;

			return err;

	}

	}





	phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);

	phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage);





	err = phy_write(phydev, MII_BMCR, BMCR_RESET);

	err = phy_write(phydev, MII_BMCR, BMCR_RESET);

	if (err < 0)

	if (err < 0)
@@ -229,11 +230,11 @@ static int m88e1121_config_aneg(struct phy_device *phydev) 
	if (err < 0)

	if (err < 0)

		return err;

		return err;





	oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE);

	oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE);





	phy_write(phydev, MII_88E1121_PHY_PAGE, MII_88E1121_PHY_LED_PAGE);

	phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_88E1121_PHY_LED_PAGE);

	phy_write(phydev, MII_88E1121_PHY_LED_CTRL, MII_88E1121_PHY_LED_DEF);

	phy_write(phydev, MII_88E1121_PHY_LED_CTRL, MII_88E1121_PHY_LED_DEF);

	phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);

	phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage);





	err = genphy_config_aneg(phydev);

	err = genphy_config_aneg(phydev);
@@ -244,9 +245,9 @@ static int m88e1318_config_aneg(struct phy_device *phydev) 
{

{

	int err, oldpage, mscr;

	int err, oldpage, mscr;





	oldpage = phy_read(phydev, MII_88E1121_PHY_PAGE);

	oldpage = phy_read(phydev, MII_MARVELL_PHY_PAGE);





	err = phy_write(phydev, MII_88E1121_PHY_PAGE,

	err = phy_write(phydev, MII_MARVELL_PHY_PAGE,

			MII_88E1121_PHY_MSCR_PAGE);

			MII_88E1121_PHY_MSCR_PAGE);

	if (err < 0)

	if (err < 0)

		return err;

		return err;
@@ -258,7 +259,7 @@ static int m88e1318_config_aneg(struct phy_device *phydev) 
	if (err < 0)

	if (err < 0)

		return err;

		return err;





	err = phy_write(phydev, MII_88E1121_PHY_PAGE, oldpage);

	err = phy_write(phydev, MII_MARVELL_PHY_PAGE, oldpage);

	if (err < 0)

	if (err < 0)

		return err;

		return err;
@@ -398,7 +399,7 @@ static int m88e1118_config_init(struct phy_device *phydev) 
	int err;

	int err;





	/* Change address */

	/* Change address */

	err = phy_write(phydev, 0x16, 0x0002);

	err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0002);

	if (err < 0)

	if (err < 0)

		return err;

		return err;
@@ -408,7 +409,7 @@ static int m88e1118_config_init(struct phy_device *phydev) 
		return err;

		return err;





	/* Change address */

	/* Change address */

	err = phy_write(phydev, 0x16, 0x0003);

	err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0003);

	if (err < 0)

	if (err < 0)

		return err;

		return err;
@@ -421,7 +422,7 @@ static int m88e1118_config_init(struct phy_device *phydev) 
		return err;

		return err;





	/* Reset address */

	/* Reset address */

	err = phy_write(phydev, 0x16, 0x0);

	err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0);

	if (err < 0)

	if (err < 0)

		return err;

		return err;