diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-07-07 12:11:23 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-07-07 12:11:23 -0700 |
| commit | 345e397d841068c4ba2829a226fbe6613bac1d0d (patch) | |
| tree | 70ba905bd380876b57b5ce47fb55f198e149ee6c /arch/arm/plat-omap | |
| parent | 727e18b429e3badda12d1de74f492bfa363a2e94 (diff) | |
| parent | 21385eeb02e59cb2a72b60cd146f9c1ce3cb0acd (diff) | |
Merge branch 'peter/topic/for-tony' of git://gitorious.org/omap-audio/linux-audio into twl-asoc
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/irqs.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index c88432005665..926d25c780f3 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h @@ -407,11 +407,19 @@ #endif #define TWL6030_IRQ_END (TWL6030_IRQ_BASE + TWL6030_BASE_NR_IRQS) +#define TWL6040_CODEC_IRQ_BASE TWL6030_IRQ_END +#ifdef CONFIG_TWL6040_CODEC +#define TWL6040_CODEC_NR_IRQS 6 +#else +#define TWL6040_CODEC_NR_IRQS 0 +#endif +#define TWL6040_CODEC_IRQ_END (TWL6040_CODEC_IRQ_BASE + TWL6040_CODEC_NR_IRQS) + /* Total number of interrupts depends on the enabled blocks above */ -#if (TWL4030_GPIO_IRQ_END > TWL6030_IRQ_END) +#if (TWL4030_GPIO_IRQ_END > TWL6040_CODEC_IRQ_END) #define TWL_IRQ_END TWL4030_GPIO_IRQ_END #else -#define TWL_IRQ_END TWL6030_IRQ_END +#define TWL_IRQ_END TWL6040_CODEC_IRQ_END #endif /* GPMC related */ |