Skip to content

Commit

Permalink
ARM: imx6q: resume PL310 only when CACHE_L2X0 defined
Browse files Browse the repository at this point in the history
Original patch from Lothar Waßmann, this patch fixes a building error
when CONFIG_CACHE_L2X0 is not defined.

Cc: Lothar Waßmann <lw@karo-electronics.de>
Signed-off-by: Eric Miao <eric.miao@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
  • Loading branch information
Eric Miao authored and Shawn Guo committed Dec 26, 2011
1 parent 46ec1b2 commit 733d172
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
13 changes: 9 additions & 4 deletions arch/arm/mach-imx/head-v7.S
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ ENDPROC(v7_secondary_startup)
.data
.align

#ifdef CONFIG_CACHE_L2X0
.macro pl310_resume
ldr r2, phys_l2x0_saved_regs
ldr r0, [r2, #L2X0_R_PHY_BASE] @ get physical base of l2x0
Expand All @@ -89,13 +90,17 @@ ENDPROC(v7_secondary_startup)
str r1, [r0, #L2X0_CTRL] @ re-enable L2
.endm

.globl phys_l2x0_saved_regs
phys_l2x0_saved_regs:
.long 0
#else
.macro pl310_resume
.endm
#endif

ENTRY(v7_cpu_resume)
bl v7_invalidate_l1
pl310_resume
b cpu_resume
ENDPROC(v7_cpu_resume)

.globl phys_l2x0_saved_regs
phys_l2x0_saved_regs:
.long 0
#endif
2 changes: 2 additions & 0 deletions arch/arm/mach-imx/pm-imx6q.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ void __init imx6q_pm_init(void)
* address of the data structure used by l2x0 core to save registers,
* and later restore the necessary ones in imx6q resume entry.
*/
#ifdef CONFIG_CACHE_L2X0
phys_l2x0_saved_regs = __pa(&l2x0_saved_regs);
#endif

suspend_set_ops(&imx6q_pm_ops);
}

0 comments on commit 733d172

Please sign in to comment.