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

Commit 8212c983 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: bcmgenet: rename bcmgenet_ephy_power_up 



In preparation for implementing the power down GPHY sequence, rename
bcmgenet_ephy_power_up to illustrate that it is not EPHY specific but
PHY agnostic, and add an "enable" argument.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0d017e21

drivers/net/ethernet/broadcom/genet/bcmmii.c

+13 −11
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ void bcmgenet_mii_reset(struct net_device *dev) 
	}

	}

}

}





static void bcmgenet_ephy_power_up(struct net_device *dev)

static void bcmgenet_phy_power_set(struct net_device *dev, bool enable)

{

{

	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct bcmgenet_priv *priv = netdev_priv(dev);

	u32 reg = 0;

	u32 reg = 0;
@@ -177,6 +177,7 @@ static void bcmgenet_ephy_power_up(struct net_device *dev) 
	if (!GENET_IS_V4(priv))

	if (!GENET_IS_V4(priv))

		return;

		return;





	if (enable) {

		reg = bcmgenet_ext_readl(priv, EXT_GPHY_CTRL);

		reg = bcmgenet_ext_readl(priv, EXT_GPHY_CTRL);

		reg &= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN | EXT_CK25_DIS);

		reg &= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN | EXT_CK25_DIS);

		reg |= EXT_GPHY_RESET;

		reg |= EXT_GPHY_RESET;
@@ -187,14 +188,15 @@ static void bcmgenet_ephy_power_up(struct net_device *dev) 
		bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);

		bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL);

		udelay(20);

		udelay(20);

	}

	}

}





static void bcmgenet_internal_phy_setup(struct net_device *dev)

static void bcmgenet_internal_phy_setup(struct net_device *dev)

{

{

	struct bcmgenet_priv *priv = netdev_priv(dev);

	struct bcmgenet_priv *priv = netdev_priv(dev);

	u32 reg;

	u32 reg;





	/* Power up EPHY */

	/* Power up PHY */

	bcmgenet_ephy_power_up(dev);

	bcmgenet_phy_power_set(dev, true);

	/* enable APD */

	/* enable APD */

	reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);

	reg = bcmgenet_ext_readl(priv, EXT_EXT_PWR_MGMT);

	reg |= EXT_PWR_DN_EN_LD;

	reg |= EXT_PWR_DN_EN_LD;