packages: bump uboot-sunxi to 2016.01-rc3, along with H3 PSCI/SMP patches
[openwrt/openwrt.git] / package / boot / uboot-sunxi / patches / 012-sunxi-support-psci-on-h3.patch
1 diff --git a/arch/arm/cpu/armv7/sunxi/psci_sun6i.S b/arch/arm/cpu/armv7/sunxi/psci_sun6i.S
2 index 4ff46e4..90b5bfd 100644
3 --- a/arch/arm/cpu/armv7/sunxi/psci_sun6i.S
4 +++ b/arch/arm/cpu/armv7/sunxi/psci_sun6i.S
5 @@ -106,7 +106,7 @@ psci_fiq_enter:
6 str r10, [r8, #0x100]
7 timer_wait r10, ONE_MS
8
9 -#ifdef CONFIG_MACH_SUN6I
10 +#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN8I_H3)
11 @ Activate power clamp
12 lsl r12, r9, #2 @ x4
13 add r12, r12, r8
14 @@ -170,7 +170,7 @@ psci_cpu_on:
15 movw r0, #(SUNXI_PRCM_BASE & 0xffff)
16 movt r0, #(SUNXI_PRCM_BASE >> 16)
17
18 -#ifdef CONFIG_MACH_SUN6I
19 +#if defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN8I_H3)
20 @ Release power clamp
21 lsl r5, r1, #2 @ 1 register per CPU
22 add r5, r5, r0 @ PRCM