aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-06-23 11:03:29 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-06-23 11:03:29 +0000
commit2c47bbc1993cd6cfaded67ca1ef032678cfa767a (patch)
treedc99bb74ac9f47dfccd60113c5d7a65e7a8ce387
parent7ed9369cb362aab97b1d52b2a382e0772d053300 (diff)
downloadupstream-2c47bbc1993cd6cfaded67ca1ef032678cfa767a.tar.gz
upstream-2c47bbc1993cd6cfaded67ca1ef032678cfa767a.tar.bz2
upstream-2c47bbc1993cd6cfaded67ca1ef032678cfa767a.zip
regroup interrupt controller register definitions in hardware.h
SVN-Revision: 32485
-rw-r--r--target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S6
-rw-r--r--target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h6
-rw-r--r--target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c6
3 files changed, 10 insertions, 8 deletions
diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S
index eeff72ca64..58ad30ea0a 100644
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/entry-macro.S
@@ -11,8 +11,8 @@
.endm
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
- mov \tmp, #0x40
- ldr \irqstat, [\base, \tmp]
+ mov \tmp, #MCS814X_IRQ_STS0 @ load tmp with STS0 register offset
+ ldr \irqstat, [\base, \tmp] @ load value at base + tmp
tst \irqstat, \irqstat @ test if no active IRQ's
beq 1002f @ if no active irqs return with status 0
mov \irqnr, #0 @ start from irq zero
@@ -23,7 +23,7 @@
moveq \tmp, \tmp, lsl #1 @ shift mask one to left
beq 1001b @ if zero then loop again
mov \irqstat, \tmp @ save the return mask
- mov \tmp, #0x00 @ ICR offset
+ mov \tmp, #MCS814X_IRQ_STS0 @ load tmp with ICR offset
str \irqstat, [\base, \tmp] @ clear irq with selected mask
1002:
.endm
diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h
index 75343c6340..6fb243c37e 100644
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/include/mach/hardware.h
@@ -14,6 +14,12 @@
#define MCS814X_IO_START 0x40000000
#define MCS814X_IO_SIZE 0x00100000
+/* IRQ controller register offset */
+#define MCS814X_IRQ_ICR 0x00
+#define MCS814X_IRQ_ISR 0x04
+#define MCS814X_IRQ_MASK 0x20
+#define MCS814X_IRQ_STS0 0x40
+
#define _PHYS_CONFADDR 0x40000000
#define _VIRT_CONFADDR MCS814X_IO_BASE
diff --git a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c
index c8a3c18cfb..207a09c834 100644
--- a/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c
+++ b/target/linux/mcs814x/files-3.3/arch/arm/mach-mcs814x/irq.c
@@ -14,11 +14,7 @@
#include <asm/exception.h>
#include <asm/mach/irq.h>
-
-#define MCS814X_IRQ_ICR 0x00
-#define MCS814X_IRQ_ISR 0x04
-#define MCS814X_IRQ_MASK 0x20
-#define MCS814X_IRQ_STS0 0x40
+#include <mach/hardware.h>
void __iomem *mcs814x_intc_base;