Commit 0f552393 authored by Rob Herring's avatar Rob Herring

sh: intc: remove dependency on NR_IRQS

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.
Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
parent 7f1e7637
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
*/ */
#include "internals.h" #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) void intc_balancing_enable(unsigned int irq)
{ {
......
...@@ -42,7 +42,7 @@ unsigned int nr_intc_controllers; ...@@ -42,7 +42,7 @@ unsigned int nr_intc_controllers;
* - this needs to be at least 2 for 5-bit priorities on 7780 * - 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 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) unsigned int intc_get_dfl_prio_level(void)
{ {
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include "internals.h" #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, static intc_enum __init intc_grp_id(struct intc_desc *desc,
intc_enum enum_id) intc_enum enum_id)
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <linux/export.h> #include <linux/export.h>
#include "internals.h" #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 { struct intc_virq_list {
unsigned int irq; unsigned int irq;
......
...@@ -3,6 +3,12 @@ ...@@ -3,6 +3,12 @@
#include <linux/ioport.h> #include <linux/ioport.h>
#ifdef CONFIG_SUPERH
#define INTC_NR_IRQS 512
#else
#define INTC_NR_IRQS 1024
#endif
/* /*
* Convert back and forth between INTEVT and IRQ values. * Convert back and forth between INTEVT and IRQ values.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment