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 /include/linux/brcmphy.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 'include/linux/brcmphy.h')
| -rw-r--r-- | include/linux/brcmphy.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h index 5bd35cc..3f626fe 100644 --- a/include/linux/brcmphy.h +++ b/include/linux/brcmphy.h @@ -40,7 +40,8 @@ #define PHY_BRCM_CLEAR_RGMII_MODE 0x00004000 #define PHY_BRCM_DIS_TXCRXC_NOENRGY 0x00008000 /* Broadcom BCM7xxx specific workarounds */ -#define PHY_BRCM_100MBPS_WAR 0x00010000 +#define PHY_BRCM_7XXX_REV(x) (((x) >> 8) & 0xff) +#define PHY_BRCM_7XXX_PATCH(x) ((x) & 0xff) #define PHY_BCM_FLAGS_VALID 0x80000000 /* Broadcom BCM54XX register definitions, common to most Broadcom PHYs */ |
