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/mach-tegra | |
| parent | 926fbcc08327bd0ffb9964765e6573c432957998 (diff) | |
| parent | b7073965a343fca2bcde4195fbba664c98f309d8 (diff) | |
| download | u-boot-fsl-qoriq-1f9ef0dca0a1315f0a216808ade8946bcc54e2b4.tar.xz | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'arch/arm/mach-tegra')
| -rw-r--r-- | arch/arm/mach-tegra/psci.S | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm/mach-tegra/psci.S b/arch/arm/mach-tegra/psci.S index b836da1..645d08f 100644 --- a/arch/arm/mach-tegra/psci.S +++ b/arch/arm/mach-tegra/psci.S @@ -61,9 +61,6 @@ ENTRY(psci_arch_init) ldrne r7, [r5] mcrne p15, 0, r7, c14, c0, 0 @ write CNTFRQ to CPU1..3 - bl psci_get_cpu_stack_top @ stack top => r0 - mov sp, r0 - bx r6 ENDPROC(psci_arch_init) @@ -88,12 +85,13 @@ _loop: wfi ENDPROC(psci_cpu_off) ENTRY(psci_cpu_on) - push {lr} + push {r4, r5, r6, lr} + mov r4, r1 mov r0, r1 - bl psci_get_cpu_stack_top @ get stack top of target CPU - str r2, [r0] @ store target PC at stack top - dsb + mov r1, r2 + bl psci_save_target_pc @ store target PC + mov r1, r4 ldr r6, =TEGRA_RESET_EXCEPTION_VECTOR ldr r5, =psci_cpu_entry @@ -106,9 +104,7 @@ ENTRY(psci_cpu_on) str r5, [r6, r2] mov r0, #ARM_PSCI_RET_SUCCESS @ Return PSCI_RET_SUCCESS - pop {pc} + pop {r4, r5, r6, pc} ENDPROC(psci_cpu_on) - .globl psci_text_end -psci_text_end: .popsection |