From 141c4071d3798ee4edbb2dab781a591ae836144e Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Fri, 14 Jan 2011 16:06:31 +0900 Subject: [PATCH] --- yaml --- r: 232373 b: refs/heads/master c: c488a4731abb53aa1bab9fccd8a7472083159bfd h: refs/heads/master i: 232371: f499c6f3a978722e9f65ef30d048bfea68091794 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-shmobile/Kconfig | 1 + trunk/arch/arm/mach-shmobile/intc-sh73a0.c | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3eb20881b8f2..d4513413b012 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bba958783b1b4cb0a9420f4e11082467132a334c +refs/heads/master: c488a4731abb53aa1bab9fccd8a7472083159bfd diff --git a/trunk/arch/arm/mach-shmobile/Kconfig b/trunk/arch/arm/mach-shmobile/Kconfig index 4d1b4c5c9389..a33c44fe1ae5 100644 --- a/trunk/arch/arm/mach-shmobile/Kconfig +++ b/trunk/arch/arm/mach-shmobile/Kconfig @@ -60,6 +60,7 @@ endchoice config MACH_AG5EVM bool "AG5EVM board" + select ARCH_REQUIRE_GPIOLIB depends on ARCH_SH73A0 config MACH_MACKEREL diff --git a/trunk/arch/arm/mach-shmobile/intc-sh73a0.c b/trunk/arch/arm/mach-shmobile/intc-sh73a0.c index 322d8d57cbcf..5d0e1503ece6 100644 --- a/trunk/arch/arm/mach-shmobile/intc-sh73a0.c +++ b/trunk/arch/arm/mach-shmobile/intc-sh73a0.c @@ -252,10 +252,11 @@ static irqreturn_t sh73a0_intcs_demux(int irq, void *dev_id) void __init sh73a0_init_irq(void) { - void __iomem *gic_base = __io(0xf0001000); + void __iomem *gic_dist_base = __io(0xf0001000); + void __iomem *gic_cpu_base = __io(0xf0000100); void __iomem *intevtsa = ioremap_nocache(0xffd20100, PAGE_SIZE); - gic_init(0, 29, gic_base, gic_base); + gic_init(0, 29, gic_dist_base, gic_cpu_base); register_intc_controller(&intcs_desc);