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>

diff --git a/drivers/net/phy/broadcom.c b/drivers/net/phy/broadcom.c
index 1a2b2f2..ace0ccc 100644 (file)
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@ -16,6 +16,7 @@
 
 #include <linux/module.h>
 #include <linux/phy.h>
+#include <linux/brcmphy.h>
 
 #define PHY_ID_BCM50610                0x0143bd60
 #define PHY_ID_BCM50610M       0x0143bd70
@@ -138,16 +139,6 @@
 #define BCM5482_SSD_SGMII_SLAVE_EN     0x0002  /* Slave mode enable */
 #define BCM5482_SSD_SGMII_SLAVE_AD     0x0001  /* Slave auto-detection */
 
-/*
- * Device flags for PHYs that can be configured for different operating
- * modes.
- */
-#define PHY_BCM_FLAGS_VALID            0x80000000
-#define PHY_BCM_FLAGS_INTF_XAUI                0x00000020
-#define PHY_BCM_FLAGS_INTF_SGMII       0x00000010
-#define PHY_BCM_FLAGS_MODE_1000BX      0x00000002
-#define PHY_BCM_FLAGS_MODE_COPPER      0x00000001
-
 
 /*****************************************************************************/
 /* Fast Ethernet Transceiver definitions. */

diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 9b64b6d..daa1480 100644 (file)
--- 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