From 14862cc8ab636811fffef06b954b6b45fdda3e79 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 19 Mar 2013 12:19:01 +0100 Subject: [PATCH] --- yaml --- r: 370687 b: refs/heads/master c: 630be7ea2f2d0c2ee5662308297b77087da2ace2 h: refs/heads/master i: 370685: ea21bcac97af0ec5c97ac1f6644444e609f6d621 370683: a545e55c6e4395e90df0518ab3e6e10043940b46 370679: d36eb8b0cf5ae6f3fc43cb5dbb6f69f347bd0dcf 370671: d5b549e0fe13e586591ac47eb5dc043cf7fd252f 370655: be102596c5ffe58c7d611f5db8a2c3b680e1dfad 370623: f85a1df5c7bf4abebfd2dc9d38dc8c3359616500 370559: 52d3f083e5001f2cfe722bf6f1092c0ad7465f80 370431: 65f9c17465b7bc5f169c78350aebf0fafa343939 370175: 430e3ea7aa027b56ed42f43040edd8fd5aea6d23 369663: d89d10728077823fa46afd52e56ac1bad1ee069e 368639: ff4a465ba38176aa367ab3b50ff460f3fac2aee4 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/mach-prima2/common.c | 2 ++ trunk/arch/arm/mach-prima2/include/mach/irqs.h | 17 ----------------- 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 trunk/arch/arm/mach-prima2/include/mach/irqs.h diff --git a/[refs] b/[refs] index c77bf161792c..029ac208d183 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60dbd7680f069c07525a825d805fd2644eae92e6 +refs/heads/master: 630be7ea2f2d0c2ee5662308297b77087da2ace2 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 5bfd584929c8..c674b32e9b15 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -427,6 +427,7 @@ config ARCH_SIRF select PINCTRL select PINCTRL_SIRF select USE_OF + select SPARSE_IRQ help Support for CSR SiRFprimaII/Marco/Polo platforms diff --git a/trunk/arch/arm/mach-prima2/common.c b/trunk/arch/arm/mach-prima2/common.c index 15c14dfb47a0..31f43eac1420 100644 --- a/trunk/arch/arm/mach-prima2/common.c +++ b/trunk/arch/arm/mach-prima2/common.c @@ -45,6 +45,7 @@ static const char *atlas6_dt_match[] __initdata = { DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)") /* Maintainer: Barry Song */ + .nr_irqs = 128, .map_io = sirfsoc_map_io, .init_irq = irqchip_init, .init_time = sirfsoc_prima2_timer_init, @@ -63,6 +64,7 @@ static const char *prima2_dt_match[] __initdata = { DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)") /* Maintainer: Barry Song */ + .nr_irqs = 128, .map_io = sirfsoc_map_io, .init_irq = irqchip_init, .init_time = sirfsoc_prima2_timer_init, diff --git a/trunk/arch/arm/mach-prima2/include/mach/irqs.h b/trunk/arch/arm/mach-prima2/include/mach/irqs.h deleted file mode 100644 index b778a0f248ed..000000000000 --- a/trunk/arch/arm/mach-prima2/include/mach/irqs.h +++ /dev/null @@ -1,17 +0,0 @@ -/* - * arch/arm/mach-prima2/include/mach/irqs.h - * - * Copyright (c) 2011 Cambridge Silicon Radio Limited, a CSR plc group company. - * - * Licensed under GPLv2 or later. - */ - -#ifndef __ASM_ARCH_IRQS_H -#define __ASM_ARCH_IRQS_H - -#define SIRFSOC_INTENAL_IRQ_START 0 -#define SIRFSOC_INTENAL_IRQ_END 127 -#define SIRFSOC_GPIO_IRQ_START (SIRFSOC_INTENAL_IRQ_END + 1) -#define NR_IRQS 288 - -#endif