diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2009-11-02 09:30:00 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-03 02:39:11 -0500 |
commit | 8649f13d2d810406da444a6101906041b796fbde (patch) | |
tree | 9c1acaf66673c3ffa2b0eaedc6d2508ac176d048 /drivers | |
parent | c73430d04ec75962e20e186d34c40b6d999f0968 (diff) |
broadcom: Consolidate dev_flags definitions
This patch moves all the dev_flags enumerations outside the broadcom.c
file to include/linux/brcmphy.h. The existing flags were not used yet
and have been re-enumerated to avoid conflicts.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Reviewed-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/phy/broadcom.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c index 1a2b2f2a273a..ace0ccc87a00 100644 --- a/drivers/net/phy/broadcom.c +++ b/drivers/net/phy/broadcom.c | |||
@@ -16,6 +16,7 @@ | |||
16 | 16 | ||
17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
18 | #include <linux/phy.h> | 18 | #include <linux/phy.h> |
19 | #include <linux/brcmphy.h> | ||
19 | 20 | ||
20 | #define PHY_ID_BCM50610 0x0143bd60 | 21 | #define PHY_ID_BCM50610 0x0143bd60 |
21 | #define PHY_ID_BCM50610M 0x0143bd70 | 22 | #define PHY_ID_BCM50610M 0x0143bd70 |
@@ -138,16 +139,6 @@ | |||
138 | #define BCM5482_SSD_SGMII_SLAVE_EN 0x0002 /* Slave mode enable */ | 139 | #define BCM5482_SSD_SGMII_SLAVE_EN 0x0002 /* Slave mode enable */ |
139 | #define BCM5482_SSD_SGMII_SLAVE_AD 0x0001 /* Slave auto-detection */ | 140 | #define BCM5482_SSD_SGMII_SLAVE_AD 0x0001 /* Slave auto-detection */ |
140 | 141 | ||
141 | /* | ||
142 | * Device flags for PHYs that can be configured for different operating | ||
143 | * modes. | ||
144 | */ | ||
145 | #define PHY_BCM_FLAGS_VALID 0x80000000 | ||
146 | #define PHY_BCM_FLAGS_INTF_XAUI 0x00000020 | ||
147 | #define PHY_BCM_FLAGS_INTF_SGMII 0x00000010 | ||
148 | #define PHY_BCM_FLAGS_MODE_1000BX 0x00000002 | ||
149 | #define PHY_BCM_FLAGS_MODE_COPPER 0x00000001 | ||
150 | |||
151 | 142 | ||
152 | /*****************************************************************************/ | 143 | /*****************************************************************************/ |
153 | /* Fast Ethernet Transceiver definitions. */ | 144 | /* Fast Ethernet Transceiver definitions. */ |