From 6d928fcb7d1d5f110a2f2d0c2d1cb16f69e6c7c6 Mon Sep 17 00:00:00 2001 From: MyungJoo Ham Date: Mon, 25 Jan 2010 17:33:59 +0900 Subject: [PATCH] s5pc110: Do NOT release retention for resume at lowlevel_init.S - Let kernel/u-boot resume function do it for resume - However, for boot-up, retention release is done at lowleve_init.S --- board/samsung/universal/lowlevel_init.S | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/board/samsung/universal/lowlevel_init.S b/board/samsung/universal/lowlevel_init.S index ebc36d8..18f52b6 100644 --- a/board/samsung/universal/lowlevel_init.S +++ b/board/samsung/universal/lowlevel_init.S @@ -166,7 +166,8 @@ lowlevel_init: ldreq r2, =(1 << 31) @IO_RET_REL ldrne r2, =((1 << 31) | (1 << 30) | (1 << 29) | (1 << 28)) @ GPIO, UART_IO orr r1, r1, r2 - str r1, [r0] + /* Do not release retention here for S5PC110 */ + strne r1, [r0] #ifndef CONFIG_ONENAND_IPL /* Disable Watchdog */ @@ -387,6 +388,16 @@ wakeup: ldrne r0, =S5PC110_WAKEUP_STAT ldr r1, [r0] str r1, [r0] + + /* IO retension release */ + ldreq r0, =S5PC100_OTHERS @0xE0108200 + ldrne r0, =S5PC110_OTHERS @0xE010E000 + ldr r1, [r0] + ldreq r2, =(1 << 31) @IO_RET_REL + ldrne r2, =((1 << 31) | (1 << 30) | (1 << 29) | (1 << 28)) + orr r1, r1, r2 + str r1, [r0] + #endif 1: mov lr, r11 -- 2.7.4