lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OMAP3 SRAM: add more comments on the SRAM code

Browse Source 
Clean up comments and copyrights on the CORE DPLL3 M2 divider change code.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
Paul Walmsley
2009-06-19 19:08:27 -06:00
committed by paul
parent d0ba3922ae
commit 4267b5d152
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
arch/arm/mach-omap2/sram34xx.S
View File

@@ -3,13 +3,12 @@
* *
* Omap3 specific functions that need to be run in internal SRAM * Omap3 specific functions that need to be run in internal SRAM
* *
* (C) Copyright 2007 * Copyright (C) 2004, 2007, 2008 Texas Instruments, Inc.
* Texas Instruments Inc. * Copyright (C) 2008 Nokia Corporation
* Rajendra Nayak <rnayak@ti.com>
* *
* (C) Copyright 2004 * Rajendra Nayak <rnayak@ti.com>
* Texas Instruments, <www.ti.com>
* Richard Woodruff <r-woodruff2@ti.com> * Richard Woodruff <r-woodruff2@ti.com>
* Paul Walmsley
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@@ -38,13 +37,16 @@
.text .text
/* /*
* Change frequency of core dpll * omap3_sram_configure_core_dpll - change DPLL3 M2 divider
* r0 = sdrc_rfr_ctrl r1 = sdrc_actim_ctrla r2 = sdrc_actim_ctrlb r3 = M2 * r0 = new SDRC_RFR_CTRL register contents
* r4 = Unlock SDRC DLL? (1 = yes, 0 = no) -- only unlock DLL for * r1 = new SDRC_ACTIM_CTRLA register contents
* r2 = new SDRC_ACTIM_CTRLB register contents
* r3 = new M2 divider setting (only 1 and 2 supported right now)
* r4 = unlock SDRC DLL? (1 = yes, 0 = no). Only unlock DLL for
* SDRC rates < 83MHz * SDRC rates < 83MHz
* r5 = number of MPU cycles to wait for SDRC to stabilize after * r5 = number of MPU cycles to wait for SDRC to stabilize after
* reprogramming the SDRC when switching to a slower MPU speed * reprogramming the SDRC when switching to a slower MPU speed
* r6 = SDRC_MR_0 register value * r6 = new SDRC_MR_0 register value
* *
*/ */
ENTRY(omap3_sram_configure_core_dpll) ENTRY(omap3_sram_configure_core_dpll)
@@ -53,22 +55,22 @@ ENTRY(omap3_sram_configure_core_dpll)
ldr r5, [sp, #56] @ load extra args from the stack ldr r5, [sp, #56] @ load extra args from the stack
ldr r6, [sp, #60] @ load extra args from the stack ldr r6, [sp, #60] @ load extra args from the stack
dsb @ flush buffered writes to interconnect dsb @ flush buffered writes to interconnect
cmp r3, #0x2 cmp r3, #0x2 @ if increasing SDRC clk rate,
blne configure_sdrc blne configure_sdrc @ program the SDRC regs early (for RFR)
cmp r4, #0x1 cmp r4, #0x1 @ set the intended DLL state
bleq unlock_dll bleq unlock_dll
blne lock_dll blne lock_dll
bl sdram_in_selfrefresh @ put the SDRAM in self refresh bl sdram_in_selfrefresh @ put SDRAM in self refresh, idle SDRC
bl configure_core_dpll bl configure_core_dpll @ change the DPLL3 M2 divider
bl enable_sdrc bl enable_sdrc @ take SDRC out of idle
cmp r4, #0x1 cmp r4, #0x1 @ wait for DLL status to change
bleq wait_dll_unlock bleq wait_dll_unlock
blne wait_dll_lock blne wait_dll_lock
cmp r3, #0x1 cmp r3, #0x1 @ if increasing SDRC clk rate,
beq return_to_sdram beq return_to_sdram @ return to SDRAM code, otherwise,
bl configure_sdrc bl configure_sdrc @ reprogram SDRC regs now
mov r12, r5 @ if slowing, wait for SDRC to stabilize mov r12, r5
bl wait_clk_stable bl wait_clk_stable @ wait for SDRC to stabilize
return_to_sdram: return_to_sdram:
isb @ prevent speculative exec past here isb @ prevent speculative exec past here
mov r0, #0 @ return value mov r0, #0 @ return value
@@ -93,6 +95,7 @@ sdram_in_selfrefresh:
bic r12, r12, #0x4 @ clear PWDENA bic r12, r12, #0x4 @ clear PWDENA
str r12, [r11] @ write back to SDRC_POWER register str r12, [r11] @ write back to SDRC_POWER register
ldr r12, [r11] @ posted-write barrier for SDRC ldr r12, [r11] @ posted-write barrier for SDRC
idle_sdrc:
ldr r11, omap3_cm_iclken1_core @ read the CM_ICLKEN1_CORE reg ldr r11, omap3_cm_iclken1_core @ read the CM_ICLKEN1_CORE reg
ldr r12, [r11] ldr r12, [r11]
bic r12, r12, #0x2 @ disable iclk bit for SDRC bic r12, r12, #0x2 @ disable iclk bit for SDRC