* Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> [091014 15:10]: > From: Rajendra Nayak <rnayak@xxxxxx> > > Signed-off-by: Rajendra Nayak <rnayak@xxxxxx> > Signed-off-by: Kevin Hilman <khilman@xxxxxxxxxxxxxxxxxxx> > --- > arch/arm/mach-omap2/irq.c | 66 ++++++++++++++++++++++++++++++++ > arch/arm/plat-omap/include/mach/irqs.h | 5 ++ > 2 files changed, 71 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c > index 8db0e3a..fa2524d 100644 > --- a/arch/arm/mach-omap2/irq.c > +++ b/arch/arm/mach-omap2/irq.c > @@ -25,6 +25,10 @@ > #define INTC_SYSSTATUS 0x0014 > #define INTC_SIR 0x0040 > #define INTC_CONTROL 0x0048 > +#define INTC_PROTECTION 0x004C > +#define INTC_IDLE 0x0050 > +#define INTC_THRESHOLD 0x0068 > +#define INTC_MIR0 0x0084 > #define INTC_MIR_CLEAR0 0x0088 > #define INTC_MIR_SET0 0x008c > #define INTC_PENDING_IRQ0 0x0098 > @@ -48,6 +52,18 @@ static struct omap_irq_bank { > }, > }; > > +/* Structure to save interrupt controller context */ > +struct omap3_intc_regs { > + u32 sysconfig; > + u32 protection; > + u32 idle; > + u32 threshold; > + u32 ilr[INTCPS_NR_IRQS]; > + u32 mir[INTCPS_NR_MIR_REGS]; > +}; > + > +static struct omap3_intc_regs intc_context[ARRAY_SIZE(irq_banks)]; > + > /* INTC bank register get/set */ > > static void intc_bank_write_reg(u32 val, struct omap_irq_bank *bank, u16 reg) > @@ -201,3 +217,53 @@ void __init omap_init_irq(void) > } > } > > +#ifdef CONFIG_ARCH_OMAP3 > +void omap3_intc_save_context(void) > +{ > + int ind = 0, i = 0; > + for (ind = 0; ind < ARRAY_SIZE(irq_banks); ind++) { > + struct omap_irq_bank *bank = irq_banks + ind; > + intc_context[ind].sysconfig = > + intc_bank_read_reg(bank, INTC_SYSCONFIG); > + intc_context[ind].protection = > + intc_bank_read_reg(bank, INTC_PROTECTION); > + intc_context[ind].idle = > + intc_bank_read_reg(bank, INTC_IDLE); > + intc_context[ind].threshold = > + intc_bank_read_reg(bank, INTC_THRESHOLD); > + for (i = 0; i < INTCPS_NR_IRQS; i++) > + intc_context[ind].ilr[i] = > + intc_bank_read_reg(bank, (0x100 + 0x4*ind)); > + for (i = 0; i < INTCPS_NR_MIR_REGS; i++) > + intc_context[ind].mir[i] = > + intc_bank_read_reg(&irq_banks[0], INTC_MIR0 + > + (0x20 * i)); > + } > +} > + These too look like they should work on 24xx and 34xx? > +void omap3_intc_restore_context(void) > +{ > + int ind = 0, i = 0; > + > + for (ind = 0; ind < ARRAY_SIZE(irq_banks); ind++) { > + struct omap_irq_bank *bank = irq_banks + ind; > + intc_bank_write_reg(intc_context[ind].sysconfig, > + bank, INTC_SYSCONFIG); > + intc_bank_write_reg(intc_context[ind].sysconfig, > + bank, INTC_SYSCONFIG); > + intc_bank_write_reg(intc_context[ind].protection, > + bank, INTC_PROTECTION); > + intc_bank_write_reg(intc_context[ind].idle, > + bank, INTC_IDLE); > + intc_bank_write_reg(intc_context[ind].threshold, > + bank, INTC_THRESHOLD); > + for (i = 0; i < INTCPS_NR_IRQS; i++) > + intc_bank_write_reg(intc_context[ind].ilr[i], > + bank, (0x100 + 0x4*ind)); > + for (i = 0; i < INTCPS_NR_MIR_REGS; i++) > + intc_bank_write_reg(intc_context[ind].mir[i], > + &irq_banks[0], INTC_MIR0 + (0x20 * i)); > + } > + /* MIRs are saved and restore with other PRCM registers */ > +} > +#endif /* CONFIG_ARCH_OMAP3 */ > diff --git a/arch/arm/plat-omap/include/mach/irqs.h b/arch/arm/plat-omap/include/mach/irqs.h > index 6a6d028..2473910 100644 > --- a/arch/arm/plat-omap/include/mach/irqs.h > +++ b/arch/arm/plat-omap/include/mach/irqs.h > @@ -477,9 +477,14 @@ > > #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32)) > > +#define INTCPS_NR_MIR_REGS 3 > +#define INTCPS_NR_IRQS 96 > + > #ifndef __ASSEMBLY__ > extern void omap_init_irq(void); > extern int omap_irq_pending(void); > +void omap3_intc_save_context(void); > +void omap3_intc_restore_context(void); > #endif > > #include <mach/hardware.h> > -- > 1.6.4.3 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@xxxxxxxxxxxxxxxxxxx > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html