git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
[pandora-kernel.git]
/
arch
/
arm
/
mach-vexpress
/
ct-ca9x4.c
diff --git
a/arch/arm/mach-vexpress/ct-ca9x4.c
b/arch/arm/mach-vexpress/ct-ca9x4.c
index
2712133
..
765a71f
100644
(file)
--- a/
arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/
arch/arm/mach-vexpress/ct-ca9x4.c
@@
-150,6
+150,10
@@
static struct clk_lookup lookups[] = {
{ /* CLCD */
.dev_id = "ct:clcd",
.clk = &osc1_clk,
{ /* CLCD */
.dev_id = "ct:clcd",
.clk = &osc1_clk,
+ }, { /* SP804 timers */
+ .dev_id = "sp804",
+ .con_id = "ct-timer0",
+ .clk = &ct_sp804_clk,
}, { /* SP804 timers */
.dev_id = "sp804",
.con_id = "ct-timer1",
}, { /* SP804 timers */
.dev_id = "sp804",
.con_id = "ct-timer1",
@@
-219,6
+223,8
@@
static void ct_ca9x4_init_cpu_map(void)
for (i = 0; i < ncores; ++i)
set_cpu_possible(i, true);
for (i = 0; i < ncores; ++i)
set_cpu_possible(i, true);
+
+ set_smp_cross_call(gic_raise_softirq);
}
static void ct_ca9x4_smp_enable(unsigned int max_cpus)
}
static void ct_ca9x4_smp_enable(unsigned int max_cpus)