diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-14 15:23:00 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-14 15:25:32 -0800 |
| commit | 3e0a79695cf8600322c519b33df76b8bc2f1aaca (patch) | |
| tree | 322c96e36f819368150ccfc154f97f353abf6948 /arch/arm/mach-sunxi/headsmp.S | |
| parent | eb90217750136e4712f1d87a33e1951b80a1a365 (diff) | |
| parent | 75cac6abe756fde529a000e725dceed2b908f61a (diff) | |
Merge tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux into next/soc
From Maxime Ripard:
Second round of core additions for the Allwinner SoCs
Fixes to select missing configuration options, and update of the maintainer
file.
* tag 'sunxi-core-for-3.14-2' of https://github.com/mripard/linux:
ARM: sunxi: select ARM_PSCI
MAINTAINERS: Update Allwinner sunXi maintainer files
ARM: sunxi: Select RESET_CONTROLLER
ARM: sun6i: Add SMP support for the Allwinner A31
dt-bindings: fix example of allwinner interrupt controller
ARM: sunxi: Register the A31 reset IP in init_time
ARM: sunxi: Select ARCH_HAS_RESET_CONTROLLER
reset: Add Allwinner SoCs Reset Controller Driver
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/mach-sunxi/headsmp.S')
| -rw-r--r-- | arch/arm/mach-sunxi/headsmp.S | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/mach-sunxi/headsmp.S b/arch/arm/mach-sunxi/headsmp.S new file mode 100644 index 00000000000..a10d494fb37 --- /dev/null +++ b/arch/arm/mach-sunxi/headsmp.S @@ -0,0 +1,9 @@ +#include <linux/linkage.h> +#include <linux/init.h> + + .section ".text.head", "ax" + +ENTRY(sun6i_secondary_startup) + msr cpsr_fsxc, #0xd3 + b secondary_startup +ENDPROC(sun6i_secondary_startup) |