On Thu, 2012-03-01 at 12:31 +0530, Rajendra Nayak wrote: > On Wednesday 29 February 2012 08:55 PM, Tero Kristo wrote: > > Currently PRCM chain handler for OMAP4 requires SPARSE_IRQ to be enabled > > from kernel config, however enabling this option breaks the OMAP kernel > > completely and it can't be used. Thus, OMAP_PRCM_IRQ_BASE was added > > to the end of the irq list, and the prm_common code was changed to use > > this instead of irq_desc allocation scheme. > > > > Once SPARSE_IRQ is enabled for OMAP kernel, this patch can be reverted. > > Do you still need this, despite this fix from Benoit? > http://marc.info/?l=linux-arm-kernel&m=133043468329275&w=2
Not sure, I haven't tested that yet. -Tero > > > > > Signed-off-by: Tero Kristo<[email protected]> > > Cc: Paul Walmsley<[email protected]> > > --- > > arch/arm/mach-omap2/prm_common.c | 14 +------------- > > arch/arm/plat-omap/include/plat/irqs.h | 6 +++++- > > 2 files changed, 6 insertions(+), 14 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/prm_common.c > > b/arch/arm/mach-omap2/prm_common.c > > index 860118a..9ca829f 100644 > > --- a/arch/arm/mach-omap2/prm_common.c > > +++ b/arch/arm/mach-omap2/prm_common.c > > @@ -196,11 +196,6 @@ void omap_prcm_irq_cleanup(void) > > prcm_irq_setup->priority_mask = NULL; > > > > irq_set_chained_handler(prcm_irq_setup->irq, NULL); > > - > > - if (prcm_irq_setup->base_irq> 0) > > - irq_free_descs(prcm_irq_setup->base_irq, > > - prcm_irq_setup->nr_regs * 32); > > - prcm_irq_setup->base_irq = 0; > > } > > > > void omap_prcm_irq_prepare(void) > > @@ -282,14 +277,7 @@ int omap_prcm_register_chain_handler(struct > > omap_prcm_irq_setup *irq_setup) > > > > irq_set_chained_handler(irq_setup->irq, omap_prcm_irq_handler); > > > > - irq_setup->base_irq = irq_alloc_descs(-1, 0, irq_setup->nr_regs * 32, > > - 0); > > - > > - if (irq_setup->base_irq< 0) { > > - pr_err("PRCM: failed to allocate irq descs: %d\n", > > - irq_setup->base_irq); > > - goto err; > > - } > > + irq_setup->base_irq = OMAP_PRCM_IRQ_BASE; > > > > for (i = 0; i<= irq_setup->nr_regs; i++) { > > gc = irq_alloc_generic_chip("PRCM", 1, > > diff --git a/arch/arm/plat-omap/include/plat/irqs.h > > b/arch/arm/plat-omap/include/plat/irqs.h > > index 2efd645..fe1be1d 100644 > > --- a/arch/arm/plat-omap/include/plat/irqs.h > > +++ b/arch/arm/plat-omap/include/plat/irqs.h > > @@ -428,8 +428,12 @@ > > #define OMAP_GPMC_NR_IRQS 8 > > #define OMAP_GPMC_IRQ_END (OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS) > > > > +/* PRCM chain handler */ > > +#define OMAP_PRCM_IRQ_BASE (OMAP_GPMC_IRQ_END) > > +#define OMAP_PRCM_NR_IRQS 64 > > +#define OMAP_PRCM_IRQ_END (OMAP_PRCM_IRQ_BASE + OMAP_PRCM_NR_IRQS) > > > > -#define NR_IRQS OMAP_GPMC_IRQ_END > > +#define NR_IRQS OMAP_PRCM_IRQ_END > > > > #define OMAP_IRQ_BIT(irq) (1<< ((irq) % 32)) > > > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
