mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 10:57:46 +00:00
net: dsa: bcm_sf2: move GPHY enabling to its own function
Move the code that touches the single GPHY register from bcm_sf2_sw_resume() to a separate function since we will have to enable/disable the GPHY from different locations, and we want the code to be self-contained. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
3c09e92fb6
commit
b083668c93
1 changed files with 20 additions and 12 deletions
|
@ -233,6 +233,24 @@ static void bcm_sf2_eee_enable_set(struct dsa_switch *ds, int port, bool enable)
|
|||
core_writel(priv, reg, CORE_EEE_EN_CTRL);
|
||||
}
|
||||
|
||||
static void bcm_sf2_gphy_enable_set(struct dsa_switch *ds, bool enable)
|
||||
{
|
||||
struct bcm_sf2_priv *priv = ds_to_priv(ds);
|
||||
u32 reg;
|
||||
|
||||
if (!enable)
|
||||
return;
|
||||
|
||||
reg = reg_readl(priv, REG_SPHY_CNTRL);
|
||||
reg |= PHY_RESET;
|
||||
reg &= ~(EXT_PWR_DOWN | IDDQ_BIAS);
|
||||
reg_writel(priv, reg, REG_SPHY_CNTRL);
|
||||
udelay(21);
|
||||
reg = reg_readl(priv, REG_SPHY_CNTRL);
|
||||
reg &= ~PHY_RESET;
|
||||
reg_writel(priv, reg, REG_SPHY_CNTRL);
|
||||
}
|
||||
|
||||
static int bcm_sf2_port_setup(struct dsa_switch *ds, int port,
|
||||
struct phy_device *phy)
|
||||
{
|
||||
|
@ -771,7 +789,6 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds)
|
|||
{
|
||||
struct bcm_sf2_priv *priv = ds_to_priv(ds);
|
||||
unsigned int port;
|
||||
u32 reg;
|
||||
int ret;
|
||||
|
||||
ret = bcm_sf2_sw_rst(priv);
|
||||
|
@ -780,17 +797,8 @@ static int bcm_sf2_sw_resume(struct dsa_switch *ds)
|
|||
return ret;
|
||||
}
|
||||
|
||||
/* Reinitialize the single GPHY */
|
||||
if (priv->hw_params.num_gphy == 1) {
|
||||
reg = reg_readl(priv, REG_SPHY_CNTRL);
|
||||
reg |= PHY_RESET;
|
||||
reg &= ~(EXT_PWR_DOWN | IDDQ_BIAS);
|
||||
reg_writel(priv, reg, REG_SPHY_CNTRL);
|
||||
udelay(21);
|
||||
reg = reg_readl(priv, REG_SPHY_CNTRL);
|
||||
reg &= ~PHY_RESET;
|
||||
reg_writel(priv, reg, REG_SPHY_CNTRL);
|
||||
}
|
||||
if (priv->hw_params.num_gphy == 1)
|
||||
bcm_sf2_gphy_enable_set(ds, true);
|
||||
|
||||
for (port = 0; port < DSA_MAX_PORTS; port++) {
|
||||
if ((1 << port) & ds->phys_port_mask)
|
||||
|
|
Loading…
Reference in a new issue