diff --git a/[refs] b/[refs]
index f99790fd59af..d2589d0fd7c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73b0c0b0c1fa06acc3a02a58f301b0db0818d3d0
+refs/heads/master: 1e5b24431b58d821502bb56e67af3e74854feaf2
diff --git a/trunk/include/asm-blackfin/mach-bf548/defBF54x_base.h b/trunk/include/asm-blackfin/mach-bf548/defBF54x_base.h
index e2632db74baa..d40db5cc5d5f 100644
--- a/trunk/include/asm-blackfin/mach-bf548/defBF54x_base.h
+++ b/trunk/include/asm-blackfin/mach-bf548/defBF54x_base.h
@@ -47,6 +47,10 @@
 /* Debug/MP/Emulation Registers (0xFFC00014 - 0xFFC00014) */
 
 #define                           CHIPID  0xffc00014
+/* CHIPID Masks */
+#define                   CHIPID_VERSION  0xF0000000
+#define                    CHIPID_FAMILY  0x0FFFF000
+#define               CHIPID_MANUFACTURE  0x00000FFE
 
 /* System Reset and Interrupt Controller (0xFFC00100 - 0xFFC00104) */