aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2007-07-25 21:13:21 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-09-20 22:57:46 -0400
commitac919986d7dfc5d1d9f5585521307f222a8ebeaf (patch)
tree5a961f8ef352b4c5c98ec09afb006a9432c2f4ee /arch/sh
parent1301e71562acc301a39fd363010c971aade8511a (diff)
sh: intc - avoid SH7710 specific vector on SH7712
This patch makes sure that the sh7710 specific ipsec vector is missing if building for a sh7712. All according to the datasheet. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/kernel/cpu/sh3/setup-sh7710.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/sh3/setup-sh7710.c b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
index 93b6d7b42694..8b065aa5f507 100644
--- a/arch/sh/kernel/cpu/sh3/setup-sh7710.c
+++ b/arch/sh/kernel/cpu/sh3/setup-sh7710.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * SH7710 Setup 2 * SH3 Setup code for SH7710, SH7712
3 * 3 *
4 * Copyright (C) 2006 Paul Mundt 4 * Copyright (C) 2006 Paul Mundt
5 * Copyright (C) 2007 Nobuhiro Iwamatsu 5 * Copyright (C) 2007 Nobuhiro Iwamatsu
@@ -45,7 +45,9 @@ static struct intc_vect vectors[] = {
45 INTC_VECT(SCIF1_ERI, 0x900), INTC_VECT(SCIF1_RXI, 0x920), 45 INTC_VECT(SCIF1_ERI, 0x900), INTC_VECT(SCIF1_RXI, 0x920),
46 INTC_VECT(SCIF1_BRI, 0x940), INTC_VECT(SCIF1_TXI, 0x960), 46 INTC_VECT(SCIF1_BRI, 0x940), INTC_VECT(SCIF1_TXI, 0x960),
47 INTC_VECT(DMAC_DEI4, 0xb80), INTC_VECT(DMAC_DEI5, 0xba0), 47 INTC_VECT(DMAC_DEI4, 0xb80), INTC_VECT(DMAC_DEI5, 0xba0),
48#ifdef CONFIG_CPU_SUBTYPE_SH7710
48 INTC_VECT(IPSEC, 0xbe0), 49 INTC_VECT(IPSEC, 0xbe0),
50#endif
49 INTC_VECT(EDMAC0, 0xc00), INTC_VECT(EDMAC1, 0xc20), 51 INTC_VECT(EDMAC0, 0xc00), INTC_VECT(EDMAC1, 0xc20),
50 INTC_VECT(EDMAC2, 0xc40), 52 INTC_VECT(EDMAC2, 0xc40),
51 INTC_VECT(SIOF0_ERI, 0xe00), INTC_VECT(SIOF0_TXI, 0xe20), 53 INTC_VECT(SIOF0_ERI, 0xe00), INTC_VECT(SIOF0_TXI, 0xe20),
@@ -88,7 +90,10 @@ static struct intc_prio_reg prio_registers[] = {
88 { 0xa4000016, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } }, 90 { 0xa4000016, 16, 4, /* IPRC */ { IRQ3, IRQ2, IRQ1, IRQ0 } },
89 { 0xa4000018, 16, 4, /* IPRD */ { 0, 0, IRQ4, IRQ5 } }, 91 { 0xa4000018, 16, 4, /* IPRD */ { 0, 0, IRQ4, IRQ5 } },
90 { 0xa400001a, 16, 4, /* IPRE */ { DMAC1, SCIF0, SCIF1 } }, 92 { 0xa400001a, 16, 4, /* IPRE */ { DMAC1, SCIF0, SCIF1 } },
91 { 0xa4080000, 16, 4, /* IPRF */ { IPSEC, DMAC2 } }, 93 { 0xa4080000, 16, 4, /* IPRF */ { 0, DMAC2 } },
94#ifdef CONFIG_CPU_SUBTYPE_SH7710
95 { 0xa4080000, 16, 4, /* IPRF */ { IPSEC } },
96#endif
92 { 0xa4080002, 16, 4, /* IPRG */ { EDMAC0, EDMAC1, EDMAC2 } }, 97 { 0xa4080002, 16, 4, /* IPRG */ { EDMAC0, EDMAC1, EDMAC2 } },
93 { 0xa4080004, 16, 4, /* IPRH */ { 0, 0, 0, SIOF0 } }, 98 { 0xa4080004, 16, 4, /* IPRH */ { 0, 0, 0, SIOF0 } },
94 { 0xa4080006, 16, 4, /* IPRI */ { 0, 0, SIOF1 } }, 99 { 0xa4080006, 16, 4, /* IPRI */ { 0, 0, SIOF1 } },