From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Date: Fri, 13 Jan 2012 16:34:06 +0000 Subject: [RFC PATCH 05/10] sh: intc: remove dependency on NR_IRQS Message-Id: <1326472451-9002-6-git-send-email-robherring2@gmail.com> List-Id: References: <1326472451-9002-1-git-send-email-robherring2@gmail.com> In-Reply-To: <1326472451-9002-1-git-send-email-robherring2@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org From: Rob Herring SH intc has a compile time dependency on NR_IRQS. Make this dependency a local define so that shmobile (and ARM in general) can have run-time NR_IRQS setting. SH has NR_IRQS set to 512 and shmobile has NR_IRQS set to 1024, so we are using the maximum. Signed-off-by: Rob Herring --- drivers/sh/intc/balancing.c | 2 +- drivers/sh/intc/core.c | 2 +- drivers/sh/intc/handle.c | 2 +- drivers/sh/intc/internals.h | 9 +++++++++ drivers/sh/intc/virq.c | 2 +- 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/sh/intc/balancing.c b/drivers/sh/intc/balancing.c index cec7a96..bc78080 100644 --- a/drivers/sh/intc/balancing.c +++ b/drivers/sh/intc/balancing.c @@ -9,7 +9,7 @@ */ #include "internals.h" -static unsigned long dist_handle[NR_IRQS]; +static unsigned long dist_handle[INTC_NR_IRQS]; void intc_balancing_enable(unsigned int irq) { diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c index e53e449..2fde897 100644 --- a/drivers/sh/intc/core.c +++ b/drivers/sh/intc/core.c @@ -42,7 +42,7 @@ unsigned int nr_intc_controllers; * - this needs to be at least 2 for 5-bit priorities on 7780 */ static unsigned int default_prio_level = 2; /* 2 - 16 */ -static unsigned int intc_prio_level[NR_IRQS]; /* for now */ +static unsigned int intc_prio_level[INTC_NR_IRQS]; /* for now */ unsigned int intc_get_dfl_prio_level(void) { diff --git a/drivers/sh/intc/handle.c b/drivers/sh/intc/handle.c index 057ce56..f461d53 100644 --- a/drivers/sh/intc/handle.c +++ b/drivers/sh/intc/handle.c @@ -13,7 +13,7 @@ #include #include "internals.h" -static unsigned long ack_handle[NR_IRQS]; +static unsigned long ack_handle[INTC_NR_IRQS]; static intc_enum __init intc_grp_id(struct intc_desc *desc, intc_enum enum_id) diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h index b0e9155..469f092 100644 --- a/drivers/sh/intc/internals.h +++ b/drivers/sh/intc/internals.h @@ -6,6 +6,15 @@ #include #include +#define INTC_NR_IRQS 1024 + +#ifndef evt2irq +#define evt2irq(evt) (((evt) >> 5) - 16) +#endif +#ifndef irq2evt +#define irq2evt(irq) (((irq) + 16) << 5) +#endif + #define _INTC_MK(fn, mode, addr_e, addr_d, width, shift) \ ((shift) | ((width) << 5) | ((fn) << 9) | ((mode) << 13) | \ ((addr_e) << 16) | ((addr_d << 24))) diff --git a/drivers/sh/intc/virq.c b/drivers/sh/intc/virq.c index c7ec49f..93cec21 100644 --- a/drivers/sh/intc/virq.c +++ b/drivers/sh/intc/virq.c @@ -17,7 +17,7 @@ #include #include "internals.h" -static struct intc_map_entry intc_irq_xlate[NR_IRQS]; +static struct intc_map_entry intc_irq_xlate[INTC_NR_IRQS]; struct intc_virq_list { unsigned int irq; -- 1.7.5.4