diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-08-27 17:43:01 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-09-12 18:06:30 -0700 |
| commit | 7d7e1eba7e92c2f9c76db80adc24836e7a114bfb (patch) | |
| tree | 9b258eaa8236d9ec15fd6a000c0ad5ef5820ff4c /arch/arm/mach-omap2/prm44xx.c | |
| parent | aefaf7be498b9cfbd16e42932cdc52ab334241e0 (diff) | |
| download | talos-op-linux-7d7e1eba7e92c2f9c76db80adc24836e7a114bfb.tar.gz talos-op-linux-7d7e1eba7e92c2f9c76db80adc24836e7a114bfb.zip | |
ARM: OMAP2+: Prepare for irqs.h removal
As the interrupts should only be defined in the platform_data, and
eventually coming from device tree, there's no need to define them
in header files.
Let's remove the hardcoded references to irqs.h and fix up the includes
so we don't rely on headers included in irqs.h. Note that we're
defining OMAP_INTC_START as 0 to the interrupts. This will be needed
when we enable SPARSE_IRQ. For some drivers we need to add
#include <plat/cpu.h> for now until these drivers are fixed to
remove cpu_is_omapxxxx() usage.
While at it, sort som of the includes the standard way, and add
the trailing commas where they are missing in the related data
structures.
Note that for drivers/staging/tidspbridge we just define things
locally.
Cc: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/prm44xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/prm44xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index bb727c2d9337..df2cfe165a23 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -18,8 +18,8 @@ #include <linux/io.h> #include <plat/cpu.h> -#include <plat/irqs.h> #include <plat/prcm.h> +#include <plat/hardware.h> #include "iomap.h" #include "common.h" @@ -40,7 +40,7 @@ static struct omap_prcm_irq_setup omap4_prcm_irq_setup = { .nr_regs = 2, .irqs = omap4_prcm_irqs, .nr_irqs = ARRAY_SIZE(omap4_prcm_irqs), - .irq = OMAP44XX_IRQ_PRCM, + .irq = 11 + OMAP44XX_IRQ_GIC_START, .read_pending_irqs = &omap44xx_prm_read_pending_irqs, .ocp_barrier = &omap44xx_prm_ocp_barrier, .save_and_clear_irqen = &omap44xx_prm_save_and_clear_irqen, |
