Skip to content

Commit

Permalink
ARM: shmobile: Add SCU boot function using argument
Browse files Browse the repository at this point in the history
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: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  • Loading branch information
Magnus Damm authored and Simon Horman committed Jun 17, 2013
1 parent ebe72ab commit bfabbcc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 0 deletions.
13 changes: 13 additions & 0 deletions arch/arm/mach-shmobile/headsmp-scu.S
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@ ENTRY(shmobile_secondary_vector_scu)
2: .long shmobile_scu_base - PAGE_OFFSET + PLAT_PHYS_OFFSET
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
.globl shmobile_scu_base
shmobile_scu_base:
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-shmobile/include/mach/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ extern void shmobile_boot_vector(void);
extern unsigned long shmobile_boot_fn;
extern unsigned long shmobile_boot_arg;
extern void shmobile_secondary_vector_scu(void);
extern void shmobile_boot_scu(void);
struct clk;
extern int shmobile_clk_init(void);
extern void shmobile_handle_irq_intc(struct pt_regs *);
Expand Down

0 comments on commit bfabbcc

Please sign in to comment.