From: Rob Herring <robherring2@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 06/13] sh: intc: unify evt2irq/irq2evt macros for sh and arm
Date: Fri, 20 Jan 2012 20:33:04 +0000 [thread overview]
Message-ID: <1327091591-27125-7-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>
Move evt2irq and irq2evt macros definitions out of sh and arm includes
into a common location.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
arch/arm/mach-shmobile/Kconfig | 4 ++++
arch/arm/mach-shmobile/include/mach/irqs.h | 6 ++----
arch/sh/include/asm/irq.h | 11 -----------
include/linux/sh_intc.h | 11 +++++++++++
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 060e564..34560ca 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -100,6 +100,10 @@ config MACH_MARZEN
comment "SH-Mobile System Configuration"
+config CPU_HAS_INTEVT
+ bool
+ default y
+
menu "Memory configuration"
config MEMORY_START
diff --git a/arch/arm/mach-shmobile/include/mach/irqs.h b/arch/arm/mach-shmobile/include/mach/irqs.h
index dcb714f..828807d 100644
--- a/arch/arm/mach-shmobile/include/mach/irqs.h
+++ b/arch/arm/mach-shmobile/include/mach/irqs.h
@@ -1,15 +1,13 @@
#ifndef __ASM_MACH_IRQS_H
#define __ASM_MACH_IRQS_H
+#include <linux/sh_intc.h>
+
#define NR_IRQS 1024
/* GIC */
#define gic_spi(nr) ((nr) + 32)
-/* INTCA */
-#define evt2irq(evt) (((evt) >> 5) - 16)
-#define irq2evt(irq) (((irq) + 16) << 5)
-
/* INTCS */
#define INTCS_VECT_BASE 0x2200
#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect))
diff --git a/arch/sh/include/asm/irq.h b/arch/sh/include/asm/irq.h
index 45d08b6..2a62017 100644
--- a/arch/sh/include/asm/irq.h
+++ b/arch/sh/include/asm/irq.h
@@ -21,17 +21,6 @@
#define NO_IRQ_IGNORE ((unsigned int)-1)
/*
- * Convert back and forth between INTEVT and IRQ values.
- */
-#ifdef CONFIG_CPU_HAS_INTEVT
-#define evt2irq(evt) (((evt) >> 5) - 16)
-#define irq2evt(irq) (((irq) + 16) << 5)
-#else
-#define evt2irq(evt) (evt)
-#define irq2evt(irq) (irq)
-#endif
-
-/*
* Simple Mask Register Support
*/
extern void make_maskreg_irq(unsigned int irq);
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index b160645..e1a2ac5 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -3,6 +3,17 @@
#include <linux/ioport.h>
+/*
+ * Convert back and forth between INTEVT and IRQ values.
+ */
+#ifdef CONFIG_CPU_HAS_INTEVT
+#define evt2irq(evt) (((evt) >> 5) - 16)
+#define irq2evt(irq) (((irq) + 16) << 5)
+#else
+#define evt2irq(evt) (evt)
+#define irq2evt(irq) (irq)
+#endif
+
typedef unsigned char intc_enum;
struct intc_vect {
--
1.7.5.4
WARNING: multiple messages have this Message-ID (diff)
From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 06/13] sh: intc: unify evt2irq/irq2evt macros for sh and arm
Date: Fri, 20 Jan 2012 14:33:04 -0600 [thread overview]
Message-ID: <1327091591-27125-7-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>
Move evt2irq and irq2evt macros definitions out of sh and arm includes
into a common location.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
arch/arm/mach-shmobile/Kconfig | 4 ++++
arch/arm/mach-shmobile/include/mach/irqs.h | 6 ++----
arch/sh/include/asm/irq.h | 11 -----------
include/linux/sh_intc.h | 11 +++++++++++
4 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 060e564..34560ca 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -100,6 +100,10 @@ config MACH_MARZEN
comment "SH-Mobile System Configuration"
+config CPU_HAS_INTEVT
+ bool
+ default y
+
menu "Memory configuration"
config MEMORY_START
diff --git a/arch/arm/mach-shmobile/include/mach/irqs.h b/arch/arm/mach-shmobile/include/mach/irqs.h
index dcb714f..828807d 100644
--- a/arch/arm/mach-shmobile/include/mach/irqs.h
+++ b/arch/arm/mach-shmobile/include/mach/irqs.h
@@ -1,15 +1,13 @@
#ifndef __ASM_MACH_IRQS_H
#define __ASM_MACH_IRQS_H
+#include <linux/sh_intc.h>
+
#define NR_IRQS 1024
/* GIC */
#define gic_spi(nr) ((nr) + 32)
-/* INTCA */
-#define evt2irq(evt) (((evt) >> 5) - 16)
-#define irq2evt(irq) (((irq) + 16) << 5)
-
/* INTCS */
#define INTCS_VECT_BASE 0x2200
#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect))
diff --git a/arch/sh/include/asm/irq.h b/arch/sh/include/asm/irq.h
index 45d08b6..2a62017 100644
--- a/arch/sh/include/asm/irq.h
+++ b/arch/sh/include/asm/irq.h
@@ -21,17 +21,6 @@
#define NO_IRQ_IGNORE ((unsigned int)-1)
/*
- * Convert back and forth between INTEVT and IRQ values.
- */
-#ifdef CONFIG_CPU_HAS_INTEVT
-#define evt2irq(evt) (((evt) >> 5) - 16)
-#define irq2evt(irq) (((irq) + 16) << 5)
-#else
-#define evt2irq(evt) (evt)
-#define irq2evt(irq) (irq)
-#endif
-
-/*
* Simple Mask Register Support
*/
extern void make_maskreg_irq(unsigned int irq);
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index b160645..e1a2ac5 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -3,6 +3,17 @@
#include <linux/ioport.h>
+/*
+ * Convert back and forth between INTEVT and IRQ values.
+ */
+#ifdef CONFIG_CPU_HAS_INTEVT
+#define evt2irq(evt) (((evt) >> 5) - 16)
+#define irq2evt(irq) (((irq) + 16) << 5)
+#else
+#define evt2irq(evt) (evt)
+#define irq2evt(irq) (irq)
+#endif
+
typedef unsigned char intc_enum;
struct intc_vect {
--
1.7.5.4
next prev parent reply other threads:[~2012-01-20 20:33 UTC|newest]
Thread overview: 56+ 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 ` 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:32 ` 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 ` 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 ` 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 ` 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 ` Rob Herring
2012-01-20 20:33 ` Rob Herring [this message]
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 ` [PATCH v2 07/13] sh: intc: remove dependency on NR_IRQS Rob Herring
2012-01-20 20:33 ` Rob Herring
2012-01-20 20:33 ` [PATCH v2 08/13] ARM: mmp: remove NR_IRQS Rob Herring
2012-01-20 20:33 ` Rob Herring
2012-01-20 20:33 ` [PATCH v2 09/13] ARM: pxa: " Rob Herring
2012-01-20 20:33 ` Rob Herring
2012-01-20 20:33 ` [PATCH v2 10/13] ARM: shmobile: " Rob Herring
2012-01-20 20:33 ` 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 20:33 ` Rob Herring
2012-01-20 21:11 ` Nicolas Pitre
2012-01-20 21:11 ` Nicolas Pitre
2012-01-20 21:23 ` Rob Herring
2012-01-20 21:23 ` Rob Herring
2012-01-20 22:48 ` Nicolas Pitre
2012-01-20 22:48 ` Nicolas Pitre
2012-01-25 19:23 ` Rob Herring
2012-01-25 19:23 ` Rob Herring
2012-01-30 15:01 ` Grant Likely
2012-01-30 15:01 ` Grant Likely
2012-01-30 16:33 ` Rob Herring
2012-01-30 16:33 ` Rob Herring
2012-01-25 21:32 ` Russell King - ARM Linux
2012-01-25 21:32 ` Russell King - ARM Linux
2012-01-25 22:32 ` Nicolas Pitre
2012-01-25 22:32 ` Nicolas Pitre
2012-01-25 22:58 ` Marek Vasut
2012-01-25 22:58 ` Marek Vasut
2012-01-30 10:44 ` Cyril Hrubis
2012-01-30 10:44 ` Cyril Hrubis
2012-02-01 10:03 ` Pavel Machek
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 ` Rob Herring
2012-01-20 20:33 ` [PATCH v2 13/13] ARM: picoxcell: remove mach/irqs.h Rob Herring
2012-01-20 20:33 ` Rob Herring
2012-02-16 8:45 ` [PATCH v2 00/13] Make mach/irqs.h optional Russell King - ARM Linux
2012-02-16 8:45 ` Russell King - ARM Linux
2012-02-16 9:05 ` Russell King - ARM Linux
2012-02-16 9:05 ` Russell King - ARM Linux
2012-02-16 13:29 ` Rob Herring
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-7-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.