diff options
author | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 18:06:53 +0900 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-08-06 18:06:53 +0900 |
commit | 4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793 (patch) | |
tree | 3932656b422e63e3d3fc4629a57a1a8b7f03ef42 /arch/arm/mach-shmobile/intc-r8a7779.c | |
parent | 98724b7ec9d34d875fc193660c87d6dd0d17ceb7 (diff) | |
parent | 8b3e32c1fe5dce55e28e76b20361841dc863ec17 (diff) | |
download | linux-stable-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.tar.gz linux-stable-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.tar.bz2 linux-stable-4e0f3fcfe2f3716e3fa9c442cee93211bf2ac793.zip |
Merge branch 'dt2' into cleanup3-base
Conflicts:
arch/arm/mach-shmobile/Makefile.boot
Diffstat (limited to 'arch/arm/mach-shmobile/intc-r8a7779.c')
-rw-r--r-- | arch/arm/mach-shmobile/intc-r8a7779.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/arch/arm/mach-shmobile/intc-r8a7779.c b/arch/arm/mach-shmobile/intc-r8a7779.c index 5f9e5dc0238b..e992a68b3bc7 100644 --- a/arch/arm/mach-shmobile/intc-r8a7779.c +++ b/arch/arm/mach-shmobile/intc-r8a7779.c @@ -89,15 +89,18 @@ void __init r8a7779_init_irq_extpin(int irlm) pr_warn("r8a7779: unable to setup external irq pin mode\n"); } +#ifdef CONFIG_OF static int r8a7779_set_wake(struct irq_data *data, unsigned int on) { return 0; /* always allow wakeup */ } -static void __init r8a7779_init_irq_common(void) +void __init r8a7779_init_irq_dt(void) { gic_arch_extn.irq_set_wake = r8a7779_set_wake; + irqchip_init(); + /* route all interrupts to ARM */ __raw_writel(0xffffffff, INT2NTSR0); __raw_writel(0x3fffffff, INT2NTSR1); @@ -108,23 +111,6 @@ static void __init r8a7779_init_irq_common(void) __raw_writel(0xfffbffdf, INT2SMSKCR2); __raw_writel(0xbffffffc, INT2SMSKCR3); __raw_writel(0x003fee3f, INT2SMSKCR4); -} - -void __init r8a7779_init_irq(void) -{ - void __iomem *gic_dist_base = IOMEM(0xf0001000); - void __iomem *gic_cpu_base = IOMEM(0xf0000100); - /* use GIC to handle interrupts */ - gic_init(0, 29, gic_dist_base, gic_cpu_base); - - r8a7779_init_irq_common(); -} - -#ifdef CONFIG_OF -void __init r8a7779_init_irq_dt(void) -{ - irqchip_init(); - r8a7779_init_irq_common(); } #endif |