diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-15 14:44:01 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-15 14:44:01 (GMT) |
| commit | 1f9ef0dca0a1315f0a216808ade8946bcc54e2b4 (patch) | |
| tree | 681b36952636ee3b649e70f426ea4b9c024c397e /arch/arm/cpu/armv7/ls102xa/psci.S | |
| parent | 926fbcc08327bd0ffb9964765e6573c432957998 (diff) | |
| parent | b7073965a343fca2bcde4195fbba664c98f309d8 (diff) | |
| download | u-boot-1f9ef0dca0a1315f0a216808ade8946bcc54e2b4.tar.xz | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/cpu/armv7/ls102xa/psci.S')
| -rw-r--r-- | arch/arm/cpu/armv7/ls102xa/psci.S | 26 |
1 files changed, 7 insertions, 19 deletions
diff --git a/arch/arm/cpu/armv7/ls102xa/psci.S b/arch/arm/cpu/armv7/ls102xa/psci.S index cf5cd48..f9b26b4 100644 --- a/arch/arm/cpu/armv7/ls102xa/psci.S +++ b/arch/arm/cpu/armv7/ls102xa/psci.S @@ -29,16 +29,16 @@ @ r2 = target PC .globl psci_cpu_on psci_cpu_on: - push {lr} + push {r4, r5, r6, lr} @ Clear and Get the correct CPU number @ r1 = 0xf01 - and r1, r1, #0xff + and r4, r1, #0xff - mov r0, r1 - bl psci_get_cpu_stack_top - str r2, [r0] - dsb + mov r0, r4 + mov r1, r2 + bl psci_save_target_pc + mov r1, r4 @ Get DCFG base address movw r4, #(CONFIG_SYS_FSL_GUTS_ADDR & 0xffff) @@ -101,7 +101,7 @@ holdoff_release: @ Return mov r0, #ARM_PSCI_RET_SUCCESS - pop {lr} + pop {r4, r5, r6, lr} bx lr .globl psci_cpu_off @@ -111,16 +111,4 @@ psci_cpu_off: 1: wfi b 1b -.globl psci_arch_init -psci_arch_init: - mov r6, lr - - bl psci_get_cpu_id - bl psci_get_cpu_stack_top - mov sp, r0 - - bx r6 - - .globl psci_text_end -psci_text_end: .popsection |