projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc' into devel
[firefly-linux-kernel-4.4.55.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 f4455e3ed6a45e9e450bc3f2819c7ff158b0cdc9..e628402b754cd4c41527d67c87504ad4fea43e8e 100644
(file)
--- a/
arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/
arch/arm/mach-vexpress/ct-ca9x4.c
@@
-20,7
+20,7
@@
#include <mach/ct-ca9x4.h>
#include <mach/ct-ca9x4.h>
-#include <
plat
/timer-sp.h>
+#include <
asm/hardware
/timer-sp.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@
-59,13
+59,10
@@
static void __init ct_ca9x4_map_io(void)
v2m_map_io(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
}
v2m_map_io(ct_ca9x4_io_desc, ARRAY_SIZE(ct_ca9x4_io_desc));
}
-void __iomem *gic_cpu_base_addr;
-
static void __init ct_ca9x4_init_irq(void)
{
static void __init ct_ca9x4_init_irq(void)
{
- gic_cpu_base_addr = MMIO_P2V(A9_MPCORE_GIC_CPU);
- gic_dist_init(0, MMIO_P2V(A9_MPCORE_GIC_DIST), 29);
- gic_cpu_init(0, gic_cpu_base_addr);
+ gic_init(0, 29, MMIO_P2V(A9_MPCORE_GIC_DIST),
+ MMIO_P2V(A9_MPCORE_GIC_CPU));
}
#if 0
}
#if 0