diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-22 02:15:49 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-22 02:15:49 +0100 |
| commit | 604beee8646d94a199f1771cdae4f923b05f0e6c (patch) | |
| tree | 5655c1b5fc246950c6c94081e7967d5c67fb9fe1 /arch/arm/mach-shmobile/setup-r8a7779.c | |
| parent | Merge tag 'omap-for-v3.19/gic-regression-v2' of git://git.kernel.org/pub/scm/... (diff) | |
| parent | ARM: shmobile: r8a7779: Instantiate GIC from C board code in legacy builds (diff) | |
| download | linux-604beee8646d94a199f1771cdae4f923b05f0e6c.tar.xz linux-604beee8646d94a199f1771cdae4f923b05f0e6c.zip | |
Merge tag 'renesas-soc-fixes2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes
Merge "Second Round of Renesas ARM Based SoC Fixes for v3.19" from Simon
Horman:
* Instantiate GIC from C board code in legacy builds on r8a7778 and r8a7779
* tag 'renesas-soc-fixes2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: r8a7779: Instantiate GIC from C board code in legacy builds
ARM: shmobile: r8a7778: Instantiate GIC from C board code in legacy builds
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/setup-r8a7779.c')
| -rw-r--r-- | arch/arm/mach-shmobile/setup-r8a7779.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c index 6156d172cf31..27dceaf9e688 100644 --- a/arch/arm/mach-shmobile/setup-r8a7779.c +++ b/arch/arm/mach-shmobile/setup-r8a7779.c @@ -720,10 +720,17 @@ static int r8a7779_set_wake(struct irq_data *data, unsigned int on) void __init r8a7779_init_irq_dt(void) { +#ifdef CONFIG_ARCH_SHMOBILE_LEGACY + void __iomem *gic_dist_base = ioremap_nocache(0xf0001000, 0x1000); + void __iomem *gic_cpu_base = ioremap_nocache(0xf0000100, 0x1000); +#endif gic_arch_extn.irq_set_wake = r8a7779_set_wake; +#ifdef CONFIG_ARCH_SHMOBILE_LEGACY + gic_init(0, 29, gic_dist_base, gic_cpu_base); +#else irqchip_init(); - +#endif /* route all interrupts to ARM */ __raw_writel(0xffffffff, INT2NTSR0); __raw_writel(0x3fffffff, INT2NTSR1); |