diff --git a/[refs] b/[refs]
index 672ea8e647c9..5fd98cee1797 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fecbd7366bf5a39eaae2c03541f0b412f319534f
+refs/heads/master: bc4d6f36db4b24bf328a5fd70038a2e609b9f028
diff --git a/trunk/arch/blackfin/include/asm/processor.h b/trunk/arch/blackfin/include/asm/processor.h
index 0eece23b41c7..3040415523b2 100644
--- a/trunk/arch/blackfin/include/asm/processor.h
+++ b/trunk/arch/blackfin/include/asm/processor.h
@@ -131,8 +131,8 @@ unsigned long get_wchan(struct task_struct *p);
 /* Get the Silicon Revision of the chip */
 static inline uint32_t __pure bfin_revid(void)
 {
-	/* stored in the upper 4 bits */
-	uint32_t revid = bfin_read_CHIPID() >> 28;
+	/* Always use CHIPID, to work around ANOMALY_05000234 */
+	uint32_t revid = (bfin_read_CHIPID() & CHIPID_VERSION) >> 28;
 
 #ifdef CONFIG_BF52x
 	/* ANOMALY_05000357