From ef60e9ea1edc7010ec7c65d5c8f97b1fa56a06d9 Mon Sep 17 00:00:00 2001
From: Rajendra Nayak <rnayak@ti.com>
Date: Fri, 24 Jul 2009 19:44:01 -0600
Subject: [PATCH] --- yaml --- r: 156806 b: refs/heads/master c:
 8ff120e5303e27e03aba7b774e86fd43eaf90376 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/mach-omap2/sram34xx.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aa02fe6412a0..d256c40e89c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75f251e3d0803b028f3474fdc75be0994c377ab5
+refs/heads/master: 8ff120e5303e27e03aba7b774e86fd43eaf90376
diff --git a/trunk/arch/arm/mach-omap2/sram34xx.S b/trunk/arch/arm/mach-omap2/sram34xx.S
index 9c2d0465a83c..e6b112590d7d 100644
--- a/trunk/arch/arm/mach-omap2/sram34xx.S
+++ b/trunk/arch/arm/mach-omap2/sram34xx.S
@@ -143,7 +143,7 @@ return_to_sdram:
 unlock_dll:
 	ldr	r11, omap3_sdrc_dlla_ctrl
 	ldr	r12, [r11]
-	and	r12, r12, #FIXEDDELAY_MASK
+	bic	r12, r12, #FIXEDDELAY_MASK
 	orr	r12, r12, #FIXEDDELAY_DEFAULT
 	orr	r12, r12, #DLLIDLE_MASK
 	str	r12, [r11]		@ (no OCP barrier needed)