From: Johannes Weiner <jw@emlix.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: "Chris Zankel" <chris@zankel.net>,
linux-kernel@vger.kernel.org, "Daniel Glöckner" <dg@emlix.com>
Subject: [patch 09/12] xtensa: allow platform and variant to initialize own irq chips
Date: Tue, 14 Apr 2009 11:41:17 +0200 [thread overview]
Message-ID: <1239702080-14355-10-git-send-email-jw@emlix.com> (raw)
In-Reply-To: <1239702080-14355-1-git-send-email-jw@emlix.com>
From: Daniel Glöckner <dg@emlix.com>
There was already a PLATFORM_NR_IRQS define, which is now accompanied
by a VARIANT_NR_IRQS. To be able to initialize these interrupts,
init_IRQ now calls variant and platform specific hooks.
Signed-off-by: Daniel Glöckner <dg@emlix.com>
---
arch/xtensa/include/asm/irq.h | 21 ++++++++++++++++++---
arch/xtensa/kernel/irq.c | 3 +++
arch/xtensa/variants/dc232b/include/variant/irq.h | 4 ++++
arch/xtensa/variants/fsf/include/variant/irq.h | 4 ++++
arch/xtensa/variants/s6000/include/variant/irq.h | 1 +
5 files changed, 30 insertions(+), 3 deletions(-)
create mode 100644 arch/xtensa/variants/dc232b/include/variant/irq.h
create mode 100644 arch/xtensa/variants/fsf/include/variant/irq.h
diff --git a/arch/xtensa/include/asm/irq.h b/arch/xtensa/include/asm/irq.h
index dfac82d..c3c10a7 100644
--- a/arch/xtensa/include/asm/irq.h
+++ b/arch/xtensa/include/asm/irq.h
@@ -11,21 +11,36 @@
#ifndef _XTENSA_IRQ_H
#define _XTENSA_IRQ_H
+#include <linux/init.h>
#include <platform/hardware.h>
#include <variant/core.h>
-#ifdef CONFIG_VARIANT_IRQ_SWITCH
#include <variant/irq.h>
-#else
+#ifndef CONFIG_VARIANT_IRQ_SWITCH
static inline void variant_irq_enable(unsigned int irq) { }
static inline void variant_irq_disable(unsigned int irq) { }
#endif
+#ifndef VARIANT_NR_IRQS
+# define VARIANT_NR_IRQS 0
+#endif
#ifndef PLATFORM_NR_IRQS
# define PLATFORM_NR_IRQS 0
#endif
#define XTENSA_NR_IRQS XCHAL_NUM_INTERRUPTS
-#define NR_IRQS (XTENSA_NR_IRQS + PLATFORM_NR_IRQS)
+#define NR_IRQS (XTENSA_NR_IRQS + VARIANT_NR_IRQS + PLATFORM_NR_IRQS)
+
+#if VARIANT_NR_IRQS == 0
+static inline void variant_init_IRQ(void) { }
+#else
+void variant_init_IRQ(void) __init;
+#endif
+
+#if PLATFORM_NR_IRQS == 0
+static inline void platform_init_IRQ(void) { }
+#else
+void platform_init_IRQ(void) __init;
+#endif
static __inline__ int irq_canonicalize(int irq)
{
diff --git a/arch/xtensa/kernel/irq.c b/arch/xtensa/kernel/irq.c
index a36c85e..61c03a3 100644
--- a/arch/xtensa/kernel/irq.c
+++ b/arch/xtensa/kernel/irq.c
@@ -197,4 +197,7 @@ void __init init_IRQ(void)
}
cached_irq_mask = 0;
+
+ variant_init_IRQ();
+ platform_init_IRQ();
}
diff --git a/arch/xtensa/variants/dc232b/include/variant/irq.h b/arch/xtensa/variants/dc232b/include/variant/irq.h
new file mode 100644
index 0000000..070b9f5
--- /dev/null
+++ b/arch/xtensa/variants/dc232b/include/variant/irq.h
@@ -0,0 +1,4 @@
+#ifndef __XTENSA_VARIANT_IRQ_H
+#define __XTENSA_VARIANT_IRQ_H
+
+#endif
diff --git a/arch/xtensa/variants/fsf/include/variant/irq.h b/arch/xtensa/variants/fsf/include/variant/irq.h
new file mode 100644
index 0000000..070b9f5
--- /dev/null
+++ b/arch/xtensa/variants/fsf/include/variant/irq.h
@@ -0,0 +1,4 @@
+#ifndef __XTENSA_VARIANT_IRQ_H
+#define __XTENSA_VARIANT_IRQ_H
+
+#endif
diff --git a/arch/xtensa/variants/s6000/include/variant/irq.h b/arch/xtensa/variants/s6000/include/variant/irq.h
index fa031cb..55403d1 100644
--- a/arch/xtensa/variants/s6000/include/variant/irq.h
+++ b/arch/xtensa/variants/s6000/include/variant/irq.h
@@ -2,6 +2,7 @@
#define __XTENSA_S6000_IRQ_H
#define NO_IRQ (-1)
+#define VARIANT_NR_IRQS 8 /* GPIO interrupts */
extern void variant_irq_enable(unsigned int irq);
extern void variant_irq_disable(unsigned int irq);
--
1.6.2.107.ge47ee
next prev parent reply other threads:[~2009-04-14 9:42 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-14 9:41 Johannes Weiner
2009-04-14 9:41 ` [patch 01/12] xtensa: always use correct stack pointer for stack traces Johannes Weiner
2009-04-14 9:41 ` [patch 02/12] xtensa: register gpio chip before use Johannes Weiner
2009-04-14 9:41 ` [patch 03/12] xtensa: fix wrong extern declaration renamed in code using it Johannes Weiner
2009-04-14 9:41 ` [patch 04/12] xtensa: implement ccount calibration for s6000 Johannes Weiner
2009-04-14 9:41 ` [patch 05/12] xtensa: update s6105_defconfig for ccount calibration Johannes Weiner
2009-04-14 9:41 ` [patch 06/12] xtensa: implement CLK API Johannes Weiner
2009-04-14 9:41 ` [patch 07/12] xtensa: implement PTRACE_PEEKUSER addresses for nommu Johannes Weiner
2009-04-14 9:41 ` [patch 08/12] xtensa: s6000 dma engine support Johannes Weiner
2009-04-14 9:41 ` Johannes Weiner [this message]
2009-04-23 7:19 ` [patch 09/12] xtensa: allow platform and variant to initialize own irq chips Chris Zankel
2009-04-23 16:16 ` Daniel Glöckner
2009-04-14 9:41 ` [patch 10/12] xtensa: support s6000 gpio irqs and alternate function selection Johannes Weiner
2009-04-14 9:41 ` [patch 11/12] xtensa: s6105 specific configuration for s6gmac Johannes Weiner
2009-04-14 9:41 ` [patch 12/12] xtensa: enable s6gmac in s6105_defconfig Johannes Weiner
2009-04-16 7:42 ` Xtensa patches Chris Zankel
2009-04-16 8:24 ` Andrew Morton
2009-04-16 8:30 ` Paul Mundt
2009-04-16 8:56 ` Andrew Morton
2009-04-16 9:06 ` Paul Mundt
2009-04-16 8:35 ` Stephen Rothwell
2009-04-16 9:15 ` Chris Zankel
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=1239702080-14355-10-git-send-email-jw@emlix.com \
--to=jw@emlix.com \
--cc=akpm@linux-foundation.org \
--cc=chris@zankel.net \
--cc=dg@emlix.com \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®