aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2009-11-02 14:30:00 +0000
committerDavid S. Miller <davem@davemloft.net>2009-11-02 23:39:11 -0800
commit8649f13d2d810406da444a6101906041b796fbde (patch)
tree9c1acaf66673c3ffa2b0eaedc6d2508ac176d048 /include/linux
parentc73430d04ec75962e20e186d34c40b6d999f0968 (diff)
downloadkernel_samsung_espresso10-8649f13d2d810406da444a6101906041b796fbde.zip
kernel_samsung_espresso10-8649f13d2d810406da444a6101906041b796fbde.tar.gz
kernel_samsung_espresso10-8649f13d2d810406da444a6101906041b796fbde.tar.bz2
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 'include/linux')
-rw-r--r--include/linux/brcmphy.h17
1 files changed, 11 insertions, 6 deletions
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 9b64b6d..daa1480 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -1,6 +1,11 @@
-#define PHY_BRCM_WIRESPEED_ENABLE 0x00000001
-#define PHY_BRCM_AUTO_PWRDWN_ENABLE 0x00000002
-#define PHY_BRCM_APD_CLK125_ENABLE 0x00000004
-#define PHY_BRCM_STD_IBND_DISABLE 0x00000008
-#define PHY_BRCM_EXT_IBND_RX_ENABLE 0x00000010
-#define PHY_BRCM_EXT_IBND_TX_ENABLE 0x00000020
+#define PHY_BCM_FLAGS_MODE_COPPER 0x00000001
+#define PHY_BCM_FLAGS_MODE_1000BX 0x00000002
+#define PHY_BCM_FLAGS_INTF_SGMII 0x00000010
+#define PHY_BCM_FLAGS_INTF_XAUI 0x00000020
+#define PHY_BRCM_WIRESPEED_ENABLE 0x00000100
+#define PHY_BRCM_AUTO_PWRDWN_ENABLE 0x00000200
+#define PHY_BRCM_APD_CLK125_ENABLE 0x00000400
+#define PHY_BRCM_STD_IBND_DISABLE 0x00000800
+#define PHY_BRCM_EXT_IBND_RX_ENABLE 0x00001000
+#define PHY_BRCM_EXT_IBND_TX_ENABLE 0x00002000
+#define PHY_BCM_FLAGS_VALID 0x80000000