summaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/leon_amba.h
diff options
context:
space:
mode:
authorDaniel Hellstrom2011-01-04 02:41:30 +0100
committerDavid S. Miller2011-01-04 20:16:36 +0100
commite2305e37d4c82ef55be54e9edc8a7e2250739b4f (patch)
treee3db48384802210c241ea3450841a78b82620afd /arch/sparc/include/asm/leon_amba.h
parentSPARC/LEON: find IRQCTRL and Timer via OF-Tree, instead of hardcoded. (diff)
downloadkernel-qcow2-linux-e2305e37d4c82ef55be54e9edc8a7e2250739b4f.tar.gz
kernel-qcow2-linux-e2305e37d4c82ef55be54e9edc8a7e2250739b4f.tar.xz
kernel-qcow2-linux-e2305e37d4c82ef55be54e9edc8a7e2250739b4f.zip
SPARC/LEON: added support for IRQAMP IRQ Controller
Needed for LEON AMP systems where different CPUs are routed to different IRQ controllers. This patch selects the IRQ Controller which has been routed to the boot CPU, it is up to the boot loader to configure the IRQ controller. Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/leon_amba.h')
-rw-r--r--arch/sparc/include/asm/leon_amba.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/leon_amba.h b/arch/sparc/include/asm/leon_amba.h
index 618e88821795..263c719e96f5 100644
--- a/arch/sparc/include/asm/leon_amba.h
+++ b/arch/sparc/include/asm/leon_amba.h
@@ -100,9 +100,8 @@ struct leon3_irqctrl_regs_map {
u32 mpbroadcast;
u32 notused02;
u32 notused03;
- u32 notused10;
- u32 notused11;
- u32 notused12;
+ u32 ampctrl;
+ u32 icsel[2];
u32 notused13;
u32 notused20;
u32 notused21;
@@ -112,6 +111,7 @@ struct leon3_irqctrl_regs_map {
u32 force[16];
/* Extended IRQ registers */
u32 intid[16]; /* 0xc0 */
+ u32 unused[(0x1000-0x100)/4];
};
struct leon3_apbuart_regs_map {