evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree

Browse source 
This enables the embedded GIC on all u8500 based hardware using DT.

Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Lee Jones 2012-03-07 17:22:30 +00:00 • committed by Arnd Bergmann
parent 7e0ce270b2
commit dab6487e35
2 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/boot/dts/db8500.dtsi
View file

@ -16,8 +16,19 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "stericsson,db8500"; compatible = "stericsson,db8500";
interrupt-parent = <&intc>;
ranges; ranges;
intc: interrupt-controller@a0411000 {
compatible = "arm,cortex-a9-gic";
#interrupt-cells = <3>;
#address-cells = <1>;
interrupt-controller;
interrupt-parent;
reg = <0xa0411000 0x1000>,
<0xa0410100 0x100>;
};
pmu { pmu {
compatible = "arm,cortex-a9-pmu"; compatible = "arm,cortex-a9-pmu";
interrupts = <0 7 0x4>; interrupts = <0 7 0x4>;

14
arch/arm/mach-ux500/cpu.c
View file

@ -16,6 +16,8 @@
#include <linux/err.h> #include <linux/err.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/of.h>
#include <linux/of_irq.h>
#include <asm/hardware/gic.h> #include <asm/hardware/gic.h>
#include <asm/mach/map.h> #include <asm/mach/map.h>
@ -28,6 +30,11 @@
void __iomem *_PRCMU_BASE; void __iomem *_PRCMU_BASE;
static const struct of_device_id ux500_dt_irq_match[] = {
{ .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
{},
};
void __init ux500_init_irq(void) void __init ux500_init_irq(void)
{ {
void __iomem *dist_base; void __iomem *dist_base;
@ -42,7 +49,12 @@ void __init ux500_init_irq(void)
} else } else
ux500_unknown_soc(); ux500_unknown_soc();
gic_init(0, 29, dist_base, cpu_base); #ifdef CONFIG_OF
if (of_have_populated_dt())
of_irq_init(ux500_dt_irq_match);
else
#endif
gic_init(0, 29, dist_base, cpu_base);
/* /*
* Init clocks here so that they are available for system timer * Init clocks here so that they are available for system timer