From: Rob Herring <robherring2@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 07/13] sh: intc: remove dependency on NR_IRQS
Date: Fri, 20 Jan 2012 20:33:05 +0000 [thread overview]
Message-ID: <1327091591-27125-8-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1327091591-27125-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <rob.herring@calxeda.com>
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: Rob Herring <rob.herring@calxeda.com>
---
drivers/sh/intc/balancing.c | 2 +-
drivers/sh/intc/core.c | 2 +-
drivers/sh/intc/handle.c | 2 +-
drivers/sh/intc/virq.c | 2 +-
include/linux/sh_intc.h | 6 ++++++
5 files changed, 10 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 <linux/spinlock.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,
intc_enum enum_id)
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 <linux/export.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 {
unsigned int irq;
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index e1a2ac5..6aed080 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -3,6 +3,12 @@
#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.
*/
--
1.7.5.4
next prev parent reply other threads:[~2012-01-20 20:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 20:32 [PATCH v2 00/13] Make mach/irqs.h optional Rob Herring
2012-01-20 20:32 ` [PATCH v2 01/13] sound: pxa2xx-ac97: include mach/irqs.h directly Rob Herring
2012-01-20 20:33 ` [PATCH v2 02/13] gpio: pxa: explicitly include mach/irqs.h Rob Herring
2012-01-20 20:33 ` [PATCH v2 03/13] ARM: remove mc146818rtc.h from time.c Rob Herring
2012-01-20 20:33 ` [PATCH v2 04/13] ARM: mc146818rtc: remove unnecessary include of mach/irqs.h Rob Herring
2012-01-20 20:33 ` [PATCH v2 05/13] ARM: it8152: explicitly include mach/irqs.h Rob Herring
2012-01-20 20:33 ` [PATCH v2 06/13] sh: intc: unify evt2irq/irq2evt macros for sh and arm Rob Herring
2012-01-20 20:33 ` Rob Herring [this message]
2012-01-20 20:33 ` [PATCH v2 08/13] ARM: mmp: remove NR_IRQS Rob Herring
2012-01-20 20:33 ` [PATCH v2 09/13] ARM: pxa: " Rob Herring
2012-01-20 20:33 ` [PATCH v2 10/13] ARM: shmobile: " Rob Herring
2012-01-20 20:33 ` [PATCH v2 11/13] ARM: only include mach/irqs.h for !SPARSE_IRQ Rob Herring
2012-01-20 21:11 ` Nicolas Pitre
2012-01-20 21:23 ` Rob Herring
2012-01-20 22:48 ` Nicolas Pitre
2012-01-25 19:23 ` Rob Herring
2012-01-30 15:01 ` Grant Likely
2012-01-30 16:33 ` Rob Herring
2012-01-25 21:32 ` Russell King - ARM Linux
2012-01-25 22:32 ` Nicolas Pitre
2012-01-25 22:58 ` Marek Vasut
2012-01-30 10:44 ` Cyril Hrubis
2012-02-01 10:03 ` Pavel Machek
2012-01-20 20:33 ` [PATCH v2 12/13] ARM: highbank: select SPARSE_IRQ and remove irqs.h Rob Herring
2012-01-20 20:33 ` [PATCH v2 13/13] ARM: picoxcell: remove mach/irqs.h Rob Herring
2012-02-16 8:45 ` [PATCH v2 00/13] Make mach/irqs.h optional Russell King - ARM Linux
2012-02-16 9:05 ` Russell King - ARM Linux
2012-02-16 13:29 ` Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327091591-27125-8-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).