Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f746ac32 authored by Gregory CLEMENT's avatar Gregory CLEMENT Committed by Jason Cooper
Browse files

ARM: mvebu: Move SCU power up in a function 



This will allow reusing the same function in the secondary_startup
for the Cortex A9 SoC.

Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
Tested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1414669184-16785-3-git-send-email-gregory.clement@free-electrons.com


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 316fbbc4

arch/arm/mach-mvebu/pmsu_ll.S

+13 −7
Original line number Original line Diff line number Diff line
@@ -12,6 +12,18 @@ 
#include <linux/linkage.h>

#include <linux/linkage.h>

#include <asm/assembler.h>

#include <asm/assembler.h>







ENTRY(armada_38x_scu_power_up)

	mrc     p15, 4, r1, c15, c0	@ get SCU base address

	orr	r1, r1, #0x8		@ SCU CPU Power Status Register

	mrc	15, 0, r0, cr0, cr0, 5	@ get the CPU ID

	and	r0, r0, #15

	add	r1, r1, r0

	mov	r0, #0x0

	strb	r0, [r1]		@ switch SCU power state to Normal mode

	ret	lr

ENDPROC(armada_38x_scu_power_up)



/*

/*

 * This is the entry point through which CPUs exiting cpuidle deep

 * This is the entry point through which CPUs exiting cpuidle deep

 * idle state are going.

 * idle state are going.
@@ -27,13 +39,7 @@ ENTRY(armada_38x_cpu_resume) 
	/* do we need it for Armada 38x*/

	/* do we need it for Armada 38x*/

ARM_BE8(setend	be )			@ go BE8 if entered LE

ARM_BE8(setend	be )			@ go BE8 if entered LE

	bl	v7_invalidate_l1

	bl	v7_invalidate_l1

	mrc     p15, 4, r1, c15, c0	@ get SCU base address

	bl	armada_38x_scu_power_up

	orr	r1, r1, #0x8		@ SCU CPU Power Status Register

	mrc	15, 0, r0, cr0, cr0, 5	@ get the CPU ID

	and	r0, r0, #15

	add	r1, r1, r0

	mov	r0, #0x0

	strb	r0, [r1]		@ switch SCU power state to Normal mode

	b	cpu_resume

	b	cpu_resume

ENDPROC(armada_38x_cpu_resume)

ENDPROC(armada_38x_cpu_resume)