diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-10 23:33:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-10 23:33:59 -0700 |
| commit | 1531407c81830e8b9b0fb00d4f49bcc1ee91dfd1 (patch) | |
| tree | 2f3b239538e5b2d3bbeeba06d3f74ed9465dc18f /drivers/net/ethernet/broadcom/b44.h | |
| parent | f9c2ff22bb2df7b8f153afd2a4bea07176bad144 (diff) | |
| parent | aafc66f106c03336e6e4ab9fd741c2b33110b7be (diff) | |
Merge branch 'brcm-pseudo-phy-addr'
Florian Fainelli says:
====================
net: phy: broadcom: define pseudo-PHY address
This patch series converts existing in-tree users of the Broadcom pseudo-PHY
address (30) used to configure MDIO-connected switches to share a constant in a
shared header files.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/b44.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/b44.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/b44.h b/drivers/net/ethernet/broadcom/b44.h index 3e9c3fc7591b..65d88d7c5581 100644 --- a/drivers/net/ethernet/broadcom/b44.h +++ b/drivers/net/ethernet/broadcom/b44.h @@ -1,6 +1,8 @@ #ifndef _B44_H #define _B44_H +#include <linux/brcmphy.h> + /* Register layout. (These correspond to struct _bcmenettregs in bcm4400.) */ #define B44_DEVCTRL 0x0000UL /* Device Control */ #define DEVCTRL_MPM 0x00000040 /* Magic Packet PME Enable (B0 only) */ @@ -281,8 +283,10 @@ struct ring_info { }; #define B44_MCAST_TABLE_SIZE 32 -#define B44_PHY_ADDR_NO_LOCAL_PHY 30 /* no local phy regs */ -#define B44_PHY_ADDR_NO_PHY 31 /* no phy present at all */ +/* no local phy regs, e.g: Broadcom switches pseudo-PHY */ +#define B44_PHY_ADDR_NO_LOCAL_PHY BRCM_PSEUDO_PHY_ADDR +/* no phy present at all */ +#define B44_PHY_ADDR_NO_PHY 31 #define B44_MDC_RATIO 5000000 #define B44_STAT_REG_DECLARE \ |