From: Magnus D. <mag...@gm...> - 2007-08-10 12:19:10
|
sh: x3 - add ipi vectors With the intc dual prio register support in place it is now possible to add the ipi vectors to x3. Signed-off-by: Magnus Damm <da...@ig...> --- arch/sh/kernel/cpu/sh4a/setup-shx3.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- 0005/arch/sh/kernel/cpu/sh4a/setup-shx3.c +++ work/arch/sh/kernel/cpu/sh4a/setup-shx3.c 2007-08-10 21:12:59.000000000 +0900 @@ -89,6 +89,8 @@ enum { FE0, FE1, GPIO0, GPIO1, GPIO2, GPIO3, PAM, IRM, + INTICI0, INTICI1, INTICI2, INTICI3, + INTICI4, INTICI5, INTICI6, INTICI7, /* interrupt groups */ IRL, PCII56789, SCIF0, SCIF1, SCIF2, SCIF3, @@ -137,6 +139,10 @@ static struct intc_vect vectors[] __init INTC_VECT(GPIO0, 0xe40), INTC_VECT(GPIO1, 0xe60), INTC_VECT(GPIO2, 0xe80), INTC_VECT(GPIO3, 0xea0), INTC_VECT(PAM, 0xec0), INTC_VECT(IRM, 0xee0), + INTC_VECT(INTICI0, 0xf00), INTC_VECT(INTICI1, 0xf20), + INTC_VECT(INTICI2, 0xf40), INTC_VECT(INTICI3, 0xf60), + INTC_VECT(INTICI4, 0xf80), INTC_VECT(INTICI5, 0xfa0), + INTC_VECT(INTICI6, 0xfc0), INTC_VECT(INTICI7, 0xfe0), }; static struct intc_group groups[] __initdata = { @@ -207,6 +213,9 @@ static struct intc_prio_reg prio_registe VIN1, VIN0, IIC, DU} }, { 0xfe410810, 0, 32, 4, /* INT2PRI4 */ { 0, 0, PAM, GPIO3, GPIO2, GPIO1, GPIO0, IRM } }, + { 0xfe410090, 0xfe4100a0, 32, 4, /* CnICIPRI / CnICIPRICLR */ + { INTICI7, INTICI6, INTICI5, INTICI4, + INTICI3, INTICI2, INTICI1, INTICI0 } }, }; static __initdata DECLARE_INTC_DESC(intc_desc, "shx3", vectors, groups, |
From: Paul M. <le...@li...> - 2007-08-12 06:46:13
|
On Fri, Aug 10, 2007 at 08:31:55PM +0900, Magnus Damm wrote: > sh: x3 - fix setup_bootmem_node() compile error with shx3_defconfig On Fri, Aug 10, 2007 at 08:41:43PM +0900, Magnus Damm wrote: > sh: intc - add a clear register to struct intc_prio_reg On Fri, Aug 10, 2007 at 08:53:17PM +0900, Magnus Damm wrote: > sh: intc - rework core code On Fri, Aug 10, 2007 at 09:05:24PM +0900, Magnus Damm wrote: > sh: intc - convert board specific r2d code V2 On Fri, Aug 10, 2007 at 09:10:27PM +0900, Magnus Damm wrote: > sh: replace sh specific CONFIG_VOYAGERGX with CONFIG_MFD_SM501 On Fri, Aug 10, 2007 at 09:17:18PM +0900, Magnus Damm wrote: > sh: x3 - add ipi vectors These have been applied and pushed out, thanks. A few minor nits.. there was quite a bit of whitespace damage and other bits that checkpatch complained rather loudly about. Please remember to run the patches through that first so I don't have to clean them up by hand. While checkpatch does have a tendency to be stupid about some things, it does catch some fairly obvious stuff. In general, if checkpatch is happy, I'm happy. Now that the R2D stuff is split up, you should provide updated defconfigs for both versions, rts7751r2d_defconfig should match the default choice for the board version (though it might be less ambiguous if we were to rename that particular defconfig to something closer to the config names). |
From: Magnus D. <mag...@gm...> - 2007-08-13 02:31:22
|
On 8/12/07, Paul Mundt <le...@li...> wrote: > On Fri, Aug 10, 2007 at 08:31:55PM +0900, Magnus Damm wrote: > > sh: x3 - fix setup_bootmem_node() compile error with shx3_defconfig > > On Fri, Aug 10, 2007 at 08:41:43PM +0900, Magnus Damm wrote: > > sh: intc - add a clear register to struct intc_prio_reg > > On Fri, Aug 10, 2007 at 08:53:17PM +0900, Magnus Damm wrote: > > sh: intc - rework core code > > On Fri, Aug 10, 2007 at 09:05:24PM +0900, Magnus Damm wrote: > > sh: intc - convert board specific r2d code V2 > > On Fri, Aug 10, 2007 at 09:10:27PM +0900, Magnus Damm wrote: > > sh: replace sh specific CONFIG_VOYAGERGX with CONFIG_MFD_SM501 > > On Fri, Aug 10, 2007 at 09:17:18PM +0900, Magnus Damm wrote: > > sh: x3 - add ipi vectors > > These have been applied and pushed out, thanks. Great, thank you! > A few minor nits.. there was quite a bit of whitespace damage and other > bits that checkpatch complained rather loudly about. Please remember to > run the patches through that first so I don't have to clean them up by > hand. While checkpatch does have a tendency to be stupid about some > things, it does catch some fairly obvious stuff. In general, if > checkpatch is happy, I'm happy. Oh, right... I checked all my previous patches with checkpatch, but with this batch I was in a hurry and forgot that step. Sorry about that, I'll try to remember that in the future. I don't want to give you boring whitespace work... =) > Now that the R2D stuff is split up, you should provide updated defconfigs > for both versions, rts7751r2d_defconfig should match the default choice > for the board version (though it might be less ambiguous if we were to > rename that particular defconfig to something closer to the config names). Yep, good idea. I'll cook up a patch for that. / magnus |