diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-05-20 19:01:21 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-05-20 19:01:21 +0300 |
| commit | 685e2d08c54b1a1bf31bbe6562f06db089d31c7b (patch) | |
| tree | 5076e95abb7ebdf6c23dc44a446c49d14dc404b9 /arch/arm/mach-omap1/i2c.c | |
| parent | b694331cfb2ec3bc2225a0ea9fddbb7e24d81c37 (diff) | |
| download | linux-685e2d08c54b1a1bf31bbe6562f06db089d31c7b.tar.xz | |
ARM: OMAP1: Change interrupt numbering for sparse IRQ
Change interrupt numbering for sparse IRQ. We do this using
a fixed offset until we can drop irqs.h once all it's users
have been updated.
Note that this depends on the GPIO fix for the MPUIO IRQs
"gpio: omap: Fix regression for MPUIO interrupts".
Also note that this patch adds some extra irq alloc warnings
that will go away when we stop calling irq_alloc_descs
in gpio-omap.c with a follow-up patch.
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/i2c.c')
| -rw-r--r-- | arch/arm/mach-omap1/i2c.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c index 7f5761cffd2e..82887d645a6a 100644 --- a/arch/arm/mach-omap1/i2c.c +++ b/arch/arm/mach-omap1/i2c.c @@ -27,7 +27,6 @@ #define OMAP_I2C_SIZE 0x3f #define OMAP1_I2C_BASE 0xfffb3800 -#define OMAP1_INT_I2C (32 + 4) static const char name[] = "omap_i2c"; @@ -67,7 +66,7 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *pdata, res[0].start = OMAP1_I2C_BASE; res[0].end = res[0].start + OMAP_I2C_SIZE; res[0].flags = IORESOURCE_MEM; - res[1].start = OMAP1_INT_I2C; + res[1].start = INT_I2C; res[1].flags = IORESOURCE_IRQ; pdev->resource = res; |