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

Commit 99d881f9 authored by Vince Bridgers's avatar Vince Bridgers Committed by David S. Miller
Browse files

net: phy: Add SGMII Configuration for Marvell 88E1145 Initialization 



Marvell phy 88E1145 configuration & initialization was missing a case
for initializing SGMII mode. This patch adds that case.

Signed-off-by: default avatarVince Bridgers <vbridger@opensource.altera.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 47276fcc

drivers/net/phy/marvell.c

+19 −0
Original line number Diff line number Diff line
@@ -50,10 +50,15 @@ 
#define MII_M1011_PHY_SCR		0x10

#define MII_M1011_PHY_SCR_AUTO_CROSS	0x0060



#define MII_M1145_PHY_EXT_SR		0x1b

#define MII_M1145_PHY_EXT_CR		0x14

#define MII_M1145_RGMII_RX_DELAY	0x0080

#define MII_M1145_RGMII_TX_DELAY	0x0002



#define MII_M1145_HWCFG_MODE_SGMII_NO_CLK	0x4

#define MII_M1145_HWCFG_MODE_MASK		0xf

#define MII_M1145_HWCFG_FIBER_COPPER_AUTO	0x8000



#define MII_M1111_PHY_LED_CONTROL	0x18

#define MII_M1111_PHY_LED_DIRECT	0x4100

#define MII_M1111_PHY_LED_COMBINE	0x411c
@@ -676,6 +681,20 @@ static int m88e1145_config_init(struct phy_device *phydev) 
		}

	}



	if (phydev->interface == PHY_INTERFACE_MODE_SGMII) {

		int temp = phy_read(phydev, MII_M1145_PHY_EXT_SR);

		if (temp < 0)

			return temp;



		temp &= ~MII_M1145_HWCFG_MODE_MASK;

		temp |= MII_M1145_HWCFG_MODE_SGMII_NO_CLK;

		temp |= MII_M1145_HWCFG_FIBER_COPPER_AUTO;



		err = phy_write(phydev, MII_M1145_PHY_EXT_SR, temp);

		if (err < 0)

			return err;

	}



	err = marvell_of_reg_init(phydev);

	if (err < 0)

		return err;