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

Commit 864dc729 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: phy: marvell: Refactor m88e1121 RGMII delay configuration 



Turns out that MII_M1116R_CONTROL_REG_MAC is the same as
MII_88E1121_PHY_MSCR_REG. Refactor the code to set the RGMII delays
into a shared helper.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 865b813a

drivers/net/phy/marvell.c

+33 −29
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
#define MII_88E1121_PHY_MSCR_REG	21

#define MII_88E1121_PHY_MSCR_RX_DELAY	BIT(5)

#define MII_88E1121_PHY_MSCR_TX_DELAY	BIT(4)

#define MII_88E1121_PHY_MSCR_DELAY_MASK	(~(0x3 << 4))

#define MII_88E1121_PHY_MSCR_DELAY_MASK	(~(BIT(5) || BIT(4)))



#define MII_88E1121_MISC_TEST				0x1a

#define MII_88E1510_MISC_TEST_TEMP_THRESHOLD_MASK	0x1f00
@@ -127,8 +127,6 @@ 
#define MII_M1011_PHY_STATUS_RESOLVED	0x0800

#define MII_M1011_PHY_STATUS_LINK	0x0400



#define MII_M1116R_CONTROL_REG_MAC	21



#define MII_88E3016_PHY_SPEC_CTRL	0x10

#define MII_88E3016_DISABLE_SCRAMBLER	0x0200

#define MII_88E3016_AUTO_MDIX_CROSSOVER	0x0030
@@ -442,7 +440,7 @@ static int marvell_of_reg_init(struct phy_device *phydev) 
}

#endif /* CONFIG_OF_MDIO */



static int m88e1121_config_aneg(struct phy_device *phydev)

static int m88e1121_config_aneg_rgmii_delays(struct phy_device *phydev)

{

	int err, oldpage, mscr;
@@ -450,9 +448,13 @@ static int m88e1121_config_aneg(struct phy_device *phydev) 
	if (oldpage < 0)

		return oldpage;



	if (phy_interface_is_rgmii(phydev)) {

		mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) &

			MII_88E1121_PHY_MSCR_DELAY_MASK;

	mscr = phy_read(phydev, MII_88E1121_PHY_MSCR_REG);

	if (mscr < 0) {

		err = mscr;

		goto out;

	}



	mscr &= MII_88E1121_PHY_MSCR_DELAY_MASK;



	if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID)

		mscr |= (MII_88E1121_PHY_MSCR_RX_DELAY |
@@ -463,11 +465,22 @@ static int m88e1121_config_aneg(struct phy_device *phydev) 
		mscr |= MII_88E1121_PHY_MSCR_TX_DELAY;



	err = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, mscr);

		if (err < 0)



out:

	marvell_set_page(phydev, oldpage);



	return err;

}



	marvell_set_page(phydev, oldpage);

static int m88e1121_config_aneg(struct phy_device *phydev)

{

	int err = 0;



	if (phy_interface_is_rgmii(phydev)) {

		err = m88e1121_config_aneg_rgmii_delays(phydev);

		if (err)

			return err;

	}



	err = genphy_soft_reset(phydev);

	if (err < 0)
@@ -650,16 +663,7 @@ static int m88e1116r_config_init(struct phy_device *phydev) 
	if (err < 0)

		return err;



	err = marvell_set_page(phydev, MII_MARVELL_MSCR_PAGE);

	if (err < 0)

		return err;

	temp = phy_read(phydev, MII_M1116R_CONTROL_REG_MAC);

	temp |= (1 << 5);

	temp |= (1 << 4);

	err = phy_write(phydev, MII_M1116R_CONTROL_REG_MAC, temp);

	if (err < 0)

		return err;

	err = marvell_set_page(phydev, MII_MARVELL_COPPER_PAGE);

	err = m88e1121_config_aneg_rgmii_delays(phydev);

	if (err < 0)

		return err;