Skip to content

Commit

Permalink
ARM: only include mach/irqs.h for !SPARSE_IRQ
Browse files Browse the repository at this point in the history
Make mach/irqs.h optional for SPARSE_IRQ. With this change mach/irqs.h can
be removed by converting platforms over to sparse irq.

Platforms either need to set nr_irqs in their machine desc or all irqchips
used by a platform need to allocate their irq_descs. There cannot be a
mixture. Once this is done, the platforms can select SPARSE_IRQ. shmobile
does the latter, and mmp and pxa do the former.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
  • Loading branch information
Rob Herring committed Jan 30, 2012
1 parent 250a272 commit a2be01b
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions arch/arm/include/asm/irq.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
#ifndef __ASM_ARM_IRQ_H
#define __ASM_ARM_IRQ_H

#define NR_IRQS_LEGACY 16

#ifndef CONFIG_SPARSE_IRQ
#include <mach/irqs.h>
#else
#define NR_IRQS NR_IRQS_LEGACY
#endif

#ifndef irq_canonicalize
#define irq_canonicalize(i) (i)
#endif

#define NR_IRQS_LEGACY 16

/*
* Use this value to indicate lack of interrupt
* capability
Expand Down

0 comments on commit a2be01b

Please sign in to comment.