diff options
| author | Florian Fainelli | 2014-09-19 22:07:56 +0200 |
|---|---|---|
| committer | David S. Miller | 2014-09-19 22:27:07 +0200 |
| commit | d8ebfed3f11b62ebc192af3cab64d835ff047e74 (patch) | |
| tree | 76f44de1599ba25217e24f3905732010260e0df2 /drivers/net/phy/bcm7xxx.c | |
| parent | net: dsa: bcm_sf2: communicate integrated PHY revision to PHY driver (diff) | |
| download | kernel-qcow2-linux-d8ebfed3f11b62ebc192af3cab64d835ff047e74.tar.gz kernel-qcow2-linux-d8ebfed3f11b62ebc192af3cab64d835ff047e74.tar.xz kernel-qcow2-linux-d8ebfed3f11b62ebc192af3cab64d835ff047e74.zip | |
net: phy: bcm7xxx: utilize PHY revision in config_init
Now that the GENET and SF2 drivers have been updated to communicate us
what is the revision of the BCM7xxx integrated PHY, utilize that
information in the config_init() callback to call into the appropriate
workaround function based on our revision.
While at it, we also print the revision and patch level to help debug
new chips.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
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 | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/drivers/net/phy/bcm7xxx.c b/drivers/net/phy/bcm7xxx.c index be3a591aabba..daae69950925 100644 --- a/drivers/net/phy/bcm7xxx.c +++ b/drivers/net/phy/bcm7xxx.c @@ -196,13 +196,22 @@ static int bcm7xxx_eee_enable(struct phy_device *phydev) static int bcm7xxx_28nm_config_init(struct phy_device *phydev) { - int ret; - - ret = bcm7445_config_init(phydev); - if (ret) - return ret; + u8 rev = PHY_BRCM_7XXX_REV(phydev->dev_flags); + u8 patch = PHY_BRCM_7XXX_PATCH(phydev->dev_flags); + int ret = 0; + + dev_info(&phydev->dev, "PHY revision: 0x%02x, patch: %d\n", rev, patch); + + switch (rev) { + case 0xa0: + case 0xb0: + ret = bcm7445_config_init(phydev); + break; + default: + ret = bcm7xxx_28nm_afe_config_init(phydev); + break; + } - ret = bcm7xxx_28nm_afe_config_init(phydev); if (ret) return ret; |