From: MyungJoo Ham <MyungJoo.Ham@samsung.com>
Date: Thu, 25 Mar 2010 03:27:58 +0000 (+0900)
Subject: s5pc110: goto INFORM0 if it's waking up from deep idle (C110 only)
X-Git-Tag: JC15_20100329~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=35acb1fb2a7c3b180e43d9a3745214572fdd727b;p=kernel%2Fu-boot.git

s5pc110: goto INFORM0 if it's waking up from deep idle (C110 only)
---

diff --git a/board/samsung/universal/lowlevel_init.S b/board/samsung/universal/lowlevel_init.S
index 86769c9..75f963b 100644
--- a/board/samsung/universal/lowlevel_init.S
+++ b/board/samsung/universal/lowlevel_init.S
@@ -64,6 +64,16 @@ lowlevel_init:
 100:
 	/* Turn on KEY_LED_ON [GPJ4(1)] XMSMWEN */
 	cmp	r7, r8
+	beq	skip_check_didle			@Support C110 only
+
+	ldr	r0, =S5PC110_RST_STAT
+	ldr	r1, [r0]
+	bic	r1, r1, #0xfff6ffff
+	cmp	r1, #0x80000
+	beq	didle_wakeup
+	cmp	r7, r8
+skip_check_didle:
+
 #ifndef DEBUG_PM_C110
 	addeq	r0, r8, #0x280				@S5PC100_GPIO_J4_OFFSET
 	addne	r0, r8, #0x2C0				@S5PC110_GPIO_J4_OFFSET
@@ -390,6 +400,27 @@ wakeup:
 	str	r1, [r0]
 
 #endif
+	b	1f
+
+didle_wakeup:
+	/* Wait when APLL is locked */
+	ldr	r0, =S5PC110_APLL_CON
+lockloop:
+	ldr	r1, [r0]
+	and	r1, r1, #(1<<29)
+	cmp	r1, #(1<<29)
+	bne	lockloop
+
+	ldr	r0, =S5PC110_INFORM0
+	ldr	r1, [r0]
+	mov	pc, r1
+	nop
+	nop
+	nop
+	nop
+	nop
+
+
 1:
 	mov	lr, r11
 	mov	pc, lr