diff options
| author | David S. Miller <davem@davemloft.net> | 2014-12-08 21:33:36 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-08 21:33:36 -0500 |
| commit | 58048e6da769e4d2e1c3ab3d1f2ce3a956230d9d (patch) | |
| tree | 06b24b57237fbd930e3b711f6105814553611d86 /drivers/net/phy/bcm7xxx.c | |
| parent | 6db70e3e1d988005c9ae6cf0f023e3c653628efb (diff) | |
| parent | 60efff0c3da9e2d9ae9f6fcdcf34061419687ab3 (diff) | |
| download | linux-58048e6da769e4d2e1c3ab3d1f2ce3a956230d9d.tar.gz linux-58048e6da769e4d2e1c3ab3d1f2ce3a956230d9d.tar.bz2 linux-58048e6da769e4d2e1c3ab3d1f2ce3a956230d9d.zip | |
Merge branch 'genet-gphy'
Florian Fainelli says:
====================
net: bcmgenet: support for new GPHY revision scheme
These two patches update the GENET GPHY revision logic to account for some
of our newer designs starting with GPHY rev G0.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/bcm7xxx.c')
| -rw-r--r-- | drivers/net/phy/bcm7xxx.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c index 7a53af4346e4..974ec4515269 100644 --- a/drivers/net/phy/bcm7xxx.c +++ b/drivers/net/phy/bcm7xxx.c @@ -252,6 +252,8 @@ static int bcm7xxx_28nm_config_init(struct phy_device *phydev) break; case 0xe0: case 0xf0: + /* Rev G0 introduces a roll over */ + case 0x10: ret = bcm7xxx_28nm_e0_plus_afe_config_init(phydev); break; default: |