diff --git a/README b/README
index 360f2a9f70b866bb83e8bb026289556d8e6657c7..57426e55eae5ae16c0581f0ba923cafaa7ad50f7 100644
--- a/README
+++ b/README
@@ -695,6 +695,7 @@ The following options need to be configured:
 		specific checks, but expect no product checks.
 		CONFIG_ARM_ERRATA_430973
 		CONFIG_ARM_ERRATA_454179
+		CONFIG_ARM_ERRATA_621766
 		CONFIG_ARM_ERRATA_798870
 
 - Tegra SoC options:
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 41fb24cf321b25ed9ff3d6c4cdebea28e380fa0e..5050021e0210edec4f760a35baaa4fa763b966fd 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -213,6 +213,19 @@ skip_errata_454179:
 	pop	{r1-r5}			@ Restore the cpu info - fall through
 
 skip_errata_430973:
+#endif
+
+#ifdef CONFIG_ARM_ERRATA_621766
+	cmp	r2, #0x21		@ Only on < r2p1
+	bge	skip_errata_621766
+
+	mrc	p15, 0, r0, c1, c0, 1	@ Read ACR
+	orr	r0, r0, #(0x1 << 5)	@ Set L1NEON bit
+	push	{r1-r5}			@ Save the cpu info registers
+	bl	v7_arch_cp15_set_acr
+	pop	{r1-r5}			@ Restore the cpu info - fall through
+
+skip_errata_621766:
 #endif
 
 	mov	pc, r5			@ back to my caller