aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-prima2/common.h
diff options
context:
space:
mode:
authorBarry Song <Baohua.Song@csr.com>2012-12-20 19:37:32 +0800
committerBarry Song <Barry.Song@csr.com>2013-01-22 19:53:27 +0800
commit4898de3d15d8ba34aa7a1b0f753a476d52ebdf92 (patch)
treee2606fb82bab7bcbe0503404ecd67fd0d3d47427 /arch/arm/mach-prima2/common.h
parentARM: PRIMA2: irq: make prima2 irq can work even we enable GIC for Marco (diff)
downloadlinux-dev-4898de3d15d8ba34aa7a1b0f753a476d52ebdf92.tar.xz
linux-dev-4898de3d15d8ba34aa7a1b0f753a476d52ebdf92.zip
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 @@
#include <asm/exception.h>
extern void sirfsoc_prima2_timer_init(void);
+extern void sirfsoc_marco_timer_init(void);
+
+extern struct smp_operations sirfsoc_smp_ops;
+extern void sirfsoc_secondary_startup(void);
+extern void sirfsoc_cpu_die(unsigned int cpu);
extern void __init sirfsoc_of_irq_init(void);
extern void __init sirfsoc_of_clk_init(void);
@@ -26,6 +31,12 @@ static inline void sirfsoc_map_lluart(void) {}
extern void __init sirfsoc_map_lluart(void);
#endif
+#ifndef CONFIG_SMP
+static inline void sirfsoc_map_scu(void) {}
+#else
+extern void sirfsoc_map_scu(void);
+#endif
+
#ifdef CONFIG_SUSPEND
extern int sirfsoc_pm_init(void);
#else