diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-19 16:27:13 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-19 16:27:13 -0400 |
| commit | 77f4f6220a98f4f3eb08be10230d7e8c604aa2b8 (patch) | |
| tree | 76f44de1599ba25217e24f3905732010260e0df2 /drivers/net/dsa/bcm_sf2_regs.h | |
| parent | 2e4e44107176d552f8bb1bb76053e850e3809841 (diff) | |
| parent | d8ebfed3f11b62ebc192af3cab64d835ff047e74 (diff) | |
| download | op-kernel-dev-77f4f6220a98f4f3eb08be10230d7e8c604aa2b8.zip op-kernel-dev-77f4f6220a98f4f3eb08be10230d7e8c604aa2b8.tar.gz | |
Merge branch 'fec-next'
Florian Fainelli says:
====================
net: phy: Broadcom BCM7xxx PHY workaround update
This patch sets the change to of_phy_connect() that you have seen before,
this time with the full context of why it is useful and applicable here.
Due to some design decision, the internal PHY on Broadcom BCM7xxx chips
is not entirely self contained and does not report its internal revision
through MII_PHYSID2, that is left to external PHY designs.
This forces us to get the PHY revision from the GENET and SF2 switch drivers
because those two peripherals integrate such a PHY and do contain the PHY
revision in their registers.
The approach taken here is hopefully easy to extend to similar needs for
other chips/ as well.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/dsa/bcm_sf2_regs.h')
| -rw-r--r-- | drivers/net/dsa/bcm_sf2_regs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/dsa/bcm_sf2_regs.h b/drivers/net/dsa/bcm_sf2_regs.h index 885c231..c65f138 100644 --- a/drivers/net/dsa/bcm_sf2_regs.h +++ b/drivers/net/dsa/bcm_sf2_regs.h @@ -25,6 +25,7 @@ #define SWITCH_TOP_REV_MASK 0xffff #define REG_PHY_REVISION 0x1C +#define PHY_REVISION_MASK 0xffff #define REG_SPHY_CNTRL 0x2C #define IDDQ_BIAS (1 << 0) |
