aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-prima2/common.h
diff options
context:
space:
mode:
authorBarry Song <Baohua.Song@csr.com>2012-12-20 06:37:32 -0500
committerBarry Song <Barry.Song@csr.com>2013-01-22 06:53:27 -0500
commit4898de3d15d8ba34aa7a1b0f753a476d52ebdf92 (patch)
treee2606fb82bab7bcbe0503404ecd67fd0d3d47427 /arch/arm/mach-prima2/common.h
parentf2a94192d953990c5c928f52dd4122a67f93b980 (diff)
ARM: PRIMA2: add new SiRFmarco SMP SoC infrastructures
this patch adds tick timer, smp entries and generic DT machine for SiRFmarco dual-core SMP chips. with the added marco, we change the defconfig, using the same defconfig, we get a zImage which can work on both prima2 and marco. Signed-off-by: Barry Song <Baohua.Song@csr.com> Cc: Mark Rutland <mark.rutland@arm.com>
Diffstat (limited to 'arch/arm/mach-prima2/common.h')
-rw-r--r--arch/arm/mach-prima2/common.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-prima2/common.h b/arch/arm/mach-prima2/common.h
index a4f91a6de55e..b7c26b62e4a7 100644
--- a/arch/arm/mach-prima2/common.h
+++ b/arch/arm/mach-prima2/common.h
@@ -14,6 +14,11 @@
14#include <asm/exception.h> 14#include <asm/exception.h>
15 15
16extern void sirfsoc_prima2_timer_init(void); 16extern void sirfsoc_prima2_timer_init(void);
17extern void sirfsoc_marco_timer_init(void);
18
19extern struct smp_operations sirfsoc_smp_ops;
20extern void sirfsoc_secondary_startup(void);
21extern void sirfsoc_cpu_die(unsigned int cpu);
17 22
18extern void __init sirfsoc_of_irq_init(void); 23extern void __init sirfsoc_of_irq_init(void);
19extern void __init sirfsoc_of_clk_init(void); 24extern void __init sirfsoc_of_clk_init(void);
@@ -26,6 +31,12 @@ static inline void sirfsoc_map_lluart(void) {}
26extern void __init sirfsoc_map_lluart(void); 31extern void __init sirfsoc_map_lluart(void);
27#endif 32#endif
28 33
34#ifndef CONFIG_SMP
35static inline void sirfsoc_map_scu(void) {}
36#else
37extern void sirfsoc_map_scu(void);
38#endif
39
29#ifdef CONFIG_SUSPEND 40#ifdef CONFIG_SUSPEND
30extern int sirfsoc_pm_init(void); 41extern int sirfsoc_pm_init(void);
31#else 42#else