Commit f5a5f430 authored by Russell King's avatar Russell King
Browse files

ARM: l2c: imx: convert to common l2c310 early resume functionality 



Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 28ed53f2

arch/arm/mach-imx/suspend-imx6.S

+3 −21
Original line number Diff line number Diff line
@@ -334,28 +334,10 @@ ENDPROC(imx6_suspend) 
 * turned into relative ones.

 */



#ifdef CONFIG_CACHE_L2X0

	.macro	pl310_resume

	adr	r0, l2x0_saved_regs_offset

	ldr	r2, [r0]

	add	r2, r2, r0

	ldr	r0, [r2, #L2X0_R_PHY_BASE]	@ get physical base of l2x0

	ldr	r1, [r2, #L2X0_R_AUX_CTRL]	@ get aux_ctrl value

	str	r1, [r0, #L2X0_AUX_CTRL]	@ restore aux_ctrl

	mov	r1, #0x1

	str	r1, [r0, #L2X0_CTRL]		@ re-enable L2

	.endm



l2x0_saved_regs_offset:

	.word	l2x0_saved_regs - .



#else

	.macro	pl310_resume

	.endm

#endif



ENTRY(v7_cpu_resume)

	bl	v7_invalidate_l1

	pl310_resume

#ifdef CONFIG_CACHE_L2X0

	bl	l2c310_early_resume

#endif

	b	cpu_resume

ENDPROC(v7_cpu_resume)