Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / drivers / net / ethernet / broadcom / bgmac.h

diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h
index 24a250267b885ca33832f5ccf0f9a58fd5be5b19..80836b4c9f3814cf115f85a8eb093e54538acd99 100644 (file)
--- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h
@@ -369,6 +369,21 @@
 #define BGMAC_CHIPCTL_1_SW_TYPE_RGMII          0x000000C0
 #define BGMAC_CHIPCTL_1_RXC_DLL_BYPASS         0x00010000
 
+#define BGMAC_CHIPCTL_4_IF_TYPE_MASK           0x00003000
+#define BGMAC_CHIPCTL_4_IF_TYPE_RMII           0x00000000
+#define BGMAC_CHIPCTL_4_IF_TYPE_MII            0x00001000
+#define BGMAC_CHIPCTL_4_IF_TYPE_RGMII          0x00002000
+#define BGMAC_CHIPCTL_4_SW_TYPE_MASK           0x0000C000
+#define BGMAC_CHIPCTL_4_SW_TYPE_EPHY           0x00000000
+#define BGMAC_CHIPCTL_4_SW_TYPE_EPHYMII                0x00004000
+#define BGMAC_CHIPCTL_4_SW_TYPE_EPHYRMII       0x00008000
+#define BGMAC_CHIPCTL_4_SW_TYPE_RGMII          0x0000C000
+
+#define BGMAC_CHIPCTL_7_IF_TYPE_MASK           0x000000C0
+#define BGMAC_CHIPCTL_7_IF_TYPE_RMII           0x00000000
+#define BGMAC_CHIPCTL_7_IF_TYPE_MII            0x00000040
+#define BGMAC_CHIPCTL_7_IF_TYPE_RGMII          0x00000080
+
 #define BGMAC_WEIGHT   64
 
 #define ETHER_MAX_LEN   1518
@@ -390,6 +405,10 @@
 #define BGMAC_FEAT_NO_CLR_MIB          BIT(13)
 #define BGMAC_FEAT_FORCE_SPEED_2500    BIT(14)
 #define BGMAC_FEAT_CMDCFG_SR_REV4      BIT(15)
+#define BGMAC_FEAT_IRQ_ID_OOB_6                BIT(16)
+#define BGMAC_FEAT_CC4_IF_SW_TYPE      BIT(17)
+#define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII        BIT(18)
+#define BGMAC_FEAT_CC7_IF_TYPE_RGMII   BIT(19)
 
 struct bgmac_slot_info {
        union {