Merge tag 'xilinx-for-v2017.07' of git://www.denx.de/git/u-boot-microblaze

[people/ms/u-boot.git] / include / fsl_sfp.h

diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h
index 353a123ee559d6b337a19bde5782ba1846fd7878..d3a28134709a0485061a90ebff12e227b6842f5e 100644 (file)
--- a/include/fsl_sfp.h
+++ b/include/fsl_sfp.h
@@ -32,7 +32,8 @@
 /* Number of SRKH registers */
 #define NUM_SRKH_REGS  8
 
-#ifdef CONFIG_SYS_FSL_SFP_VER_3_2
+#if    defined(CONFIG_SYS_FSL_SFP_VER_3_2) ||  \
+       defined(CONFIG_SYS_FSL_SFP_VER_3_4)
 struct ccsr_sfp_regs {
        u32 ospr;               /* 0x200 */
        u32 ospr1;              /* 0x204 */
@@ -77,9 +78,16 @@ struct ccsr_sfp_regs {
        u32 fsl_uid;    /* 0xB0  FSL Unique ID */
 };
 #endif
+
 #define ITS_MASK       0x00000004
 #define ITS_BIT                2
-#define OSPR_KEY_REVOC_SHIFT   13
-#define OSPR_KEY_REVOC_MASK    0x0000e000
+
+#if defined(CONFIG_SYS_FSL_SFP_VER_3_4)
+#define OSPR_KEY_REVOC_SHIFT    9
+#define OSPR_KEY_REVOC_MASK     0x0000fe00
+#else
+#define OSPR_KEY_REVOC_SHIFT    13
+#define OSPR_KEY_REVOC_MASK     0x0000e000
+#endif /* CONFIG_SYS_FSL_SFP_VER_3_4 */
 
 #endif