diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2015-03-23 18:09:52 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-23 22:10:42 -0400 |
commit | 0d017e2193ad285d7d0aac429c4c73945729de73 (patch) | |
tree | 6d794c993600a01405459fe4e160b647897fdf33 /drivers/net/ethernet/broadcom | |
parent | ca8cf341903f90070e191cc8be8f705ab7af2d4a (diff) |
net: bcmgenet: update bcmgenet_ephy_power_up to clear CK25_DIS bit
The CK25_DIS bit controls whether a 25Mhz clock is fed to the GPHY or
not, in preparation for powering down the integrated GPHY when relevant,
make sure we clear that bit.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom')
-rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/genet/bcmmii.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h index 1ea838946318..a27ef777cc81 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h | |||
@@ -354,6 +354,7 @@ struct bcmgenet_mib_counters { | |||
354 | #define EXT_GPHY_CTRL 0x1C | 354 | #define EXT_GPHY_CTRL 0x1C |
355 | #define EXT_CFG_IDDQ_BIAS (1 << 0) | 355 | #define EXT_CFG_IDDQ_BIAS (1 << 0) |
356 | #define EXT_CFG_PWR_DOWN (1 << 1) | 356 | #define EXT_CFG_PWR_DOWN (1 << 1) |
357 | #define EXT_CK25_DIS (1 << 4) | ||
357 | #define EXT_GPHY_RESET (1 << 5) | 358 | #define EXT_GPHY_RESET (1 << 5) |
358 | 359 | ||
359 | /* DMA rings size */ | 360 | /* DMA rings size */ |
diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index 446889cc3c6a..f7d9d2753141 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c | |||
@@ -178,7 +178,7 @@ static void bcmgenet_ephy_power_up(struct net_device *dev) | |||
178 | return; | 178 | return; |
179 | 179 | ||
180 | reg = bcmgenet_ext_readl(priv, EXT_GPHY_CTRL); | 180 | reg = bcmgenet_ext_readl(priv, EXT_GPHY_CTRL); |
181 | reg &= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN); | 181 | reg &= ~(EXT_CFG_IDDQ_BIAS | EXT_CFG_PWR_DOWN | EXT_CK25_DIS); |
182 | reg |= EXT_GPHY_RESET; | 182 | reg |= EXT_GPHY_RESET; |
183 | bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL); | 183 | bcmgenet_ext_writel(priv, reg, EXT_GPHY_CTRL); |
184 | mdelay(2); | 184 | mdelay(2); |