OMAP3: PM: Wait for SDRC ready iso a blind delay (89139dce) · Commits · 戴 / test

arch/arm/mach-omap2/sleep34xx.S

+36 −12

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@
		#include <mach/io.h>
		#include <plat/control.h>

		#include "cm.h"
		#include "prm.h"
		#include "sdrc.h"

		@@ -38,6 +39,7 @@
		#define PM_PREPWSTST_MPU_V OMAP34XX_PRM_REGADDR(MPU_MOD, \
		OMAP3430_PM_PREPWSTST)
		#define PM_PWSTCTRL_MPU_P OMAP3430_PRM_BASE + MPU_MOD + PM_PWSTCTRL
		#define CM_IDLEST1_CORE_V OMAP34XX_CM_REGADDR(CORE_MOD, CM_IDLEST1)
		#define SRAM_BASE_P 0x40200000
		#define CONTROL_STAT 0x480022F0
		#define SCRATCHPAD_MEM_OFFS 0x310 /* Move this as correct place is
		@@ -52,6 +54,8 @@
		#define SDRC_MR_1_P (OMAP343X_SDRC_BASE + SDRC_MR_1)
		#define SDRC_EMR2_1_P (OMAP343X_SDRC_BASE + SDRC_EMR2_1)
		#define SDRC_MANUAL_1_P (OMAP343X_SDRC_BASE + SDRC_MANUAL_1)
		#define SDRC_DLLA_STATUS_V OMAP34XX_SDRC_REGADDR(SDRC_DLLA_STATUS)
		#define SDRC_DLLA_CTRL_V OMAP34XX_SDRC_REGADDR(SDRC_DLLA_CTRL)

		.text
		/* Function call to get the restore pointer for resume from OFF */
		@@ -187,7 +191,7 @@ loop:
		nop
		nop
		nop
		bl i_dll_wait
		bl wait_sdrc_ok

		ldmfd sp!, {r0-r12, pc} @ restore regs and return
		restore_es3:
		@@ -539,21 +543,41 @@ skip_l2_inval:
		nop
		nop
		nop
		bl i_dll_wait
		bl wait_sdrc_ok
		/* restore regs and return */
		ldmfd sp!, {r0-r12, pc}

		i_dll_wait:
		ldr r4, clk_stabilize_delay

		i_dll_delay:
		subs r4, r4, #0x1
		bne i_dll_delay
		/* Make sure SDRC accesses are ok */
		wait_sdrc_ok:
		ldr r4, cm_idlest1_core
		ldr r5, [r4]
		and r5, r5, #0x2
		cmp r5, #0
		bne wait_sdrc_ok
		ldr r4, sdrc_power
		ldr r5, [r4]
		bic r5, r5, #0x40
		str r5, [r4]
		wait_dll_lock:
		/* Is dll in lock mode? */
		ldr r4, sdrc_dlla_ctrl
		ldr r5, [r4]
		tst r5, #0x4
		bxne lr
		/* wait till dll locks */
		ldr r4, sdrc_dlla_status
		ldr r5, [r4]
		and r5, r5, #0x4
		cmp r5, #0x4
		bne wait_dll_lock
		bx lr

		cm_idlest1_core:
		.word CM_IDLEST1_CORE_V
		sdrc_dlla_status:
		.word SDRC_DLLA_STATUS_V
		sdrc_dlla_ctrl:
		.word SDRC_DLLA_CTRL_V
		pm_prepwstst_core:
		.word PM_PREPWSTST_CORE_V
		pm_prepwstst_core_p:

Admin message