Merge tag 'powerpc-spectre-rsb' of powerpc-CVE-2019-18660.bundle

[linux.git] / include / linux / brcmphy.h

diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 6db2d9a6e503106261e042e5d65fdc68aa92194b..b475e7f20d28a919a151763a9497da48a2d6f8a1 100644 (file)
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -200,9 +200,15 @@
 #define BCM5482_SHD_SSD                0x14    /* 10100: Secondary SerDes control */
 #define BCM5482_SHD_SSD_LEDM   0x0008  /* SSD LED Mode enable */
 #define BCM5482_SHD_SSD_EN     0x0001  /* SSD enable */
-#define BCM5482_SHD_MODE       0x1f    /* 11111: Mode Control Register */
-#define BCM5482_SHD_MODE_1000BX        0x0001  /* Enable 1000BASE-X registers */
 
+/* 10011: SerDes 100-FX Control Register */
+#define BCM54616S_SHD_100FX_CTRL       0x13
+#define        BCM54616S_100FX_MODE            BIT(0)  /* 100-FX SerDes Enable */
+
+/* 11111: Mode Control Register */
+#define BCM54XX_SHD_MODE               0x1f
+#define BCM54XX_SHD_INTF_SEL_MASK      GENMASK(2, 1)   /* INTERF_SEL[1:0] */
+#define BCM54XX_SHD_MODE_1000BX                BIT(0)  /* Enable 1000-X registers */
 
 /*
  * EXPANSION SHADOW ACCESS REGISTERS.  (PHY REG 0x15, 0x16, and 0x17)