Add v1.1 support to nand_spl fsl nfc driver

[u-boot] / lib_avr32 / interrupts.c

diff --git a/lib_avr32/interrupts.c b/lib_avr32/interrupts.c
index ce538f3d9241a5a590824d87383a8e2aeac83d18..bbbc490db2361df8e95601a8c721a25ddbbabfc2 100644 (file)
--- a/lib_avr32/interrupts.c
+++ b/lib_avr32/interrupts.c
@@ -35,5 +35,12 @@ int disable_interrupts(void)
        sr = sysreg_read(SR);
        asm volatile("ssrf      %0" : : "n"(SYSREG_GM_OFFSET));
 
-       return SYSREG_BFEXT(GM, sr);
+#ifdef CONFIG_AT32UC3A0xxx
+       /* Two NOPs are required after masking interrupts on the
+        * AT32UC3A0512ES. See errata 41.4.5.5. */
+       asm("nop");
+       asm("nop");
+#endif
+
+       return !SYSREG_BFEXT(GM, sr);
 }