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

Commit bfabbcc6 authored by Magnus Damm's avatar Magnus Damm Committed by Simon Horman
Browse files

ARM: shmobile: Add SCU boot function using argument 



Add a shmoible_boot_scu function that assumes that the base address
of the SCU is passed in r0. This code is free from inline virtual
to physical address conversion.

Signed-off-by: default avatarMagnus Damm <damm@opensource.se>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent ebe72ab9

arch/arm/mach-shmobile/headsmp-scu.S

+13 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,19 @@ ENTRY(shmobile_secondary_vector_scu) 
2:	.long shmobile_scu_base - PAGE_OFFSET + PLAT_PHYS_OFFSET

2:	.long shmobile_scu_base - PAGE_OFFSET + PLAT_PHYS_OFFSET

ENDPROC(shmobile_secondary_vector_scu)

ENDPROC(shmobile_secondary_vector_scu)





ENTRY(shmobile_boot_scu)

					@ r0 = SCU base address

	mrc     p15, 0, r1, c0, c0, 5	@ read MIPDR

	and	r1, r1, #3		@ mask out cpu ID

	lsl	r1, r1, #3		@ we will shift by cpu_id * 8 bits

	ldr	r2, [r0, #8]		@ SCU Power Status Register

	mov	r3, #3

	bic	r2, r2, r3, lsl r1	@ Clear bits of our CPU (Run Mode)

	str	r2, [r0, #8]		@ write back



	b	shmobile_invalidate_start

ENDPROC(shmobile_boot_scu)



	.text

	.text

	.globl	shmobile_scu_base

	.globl	shmobile_scu_base

shmobile_scu_base:

shmobile_scu_base:

arch/arm/mach-shmobile/include/mach/common.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,7 @@ extern void shmobile_boot_vector(void); 
extern unsigned long shmobile_boot_fn;

extern unsigned long shmobile_boot_fn;

extern unsigned long shmobile_boot_arg;

extern unsigned long shmobile_boot_arg;

extern void shmobile_secondary_vector_scu(void);

extern void shmobile_secondary_vector_scu(void);

extern void shmobile_boot_scu(void);

struct clk;

struct clk;

extern int shmobile_clk_init(void);

extern int shmobile_clk_init(void);

extern void shmobile_handle_irq_intc(struct pt_regs *);

extern void shmobile_handle_irq_intc(struct pt_regs *);