diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-05-18 04:07:09 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-05-18 04:07:09 -0400 |
commit | 26819fcbeaba45904d604f5b02ef1138d5268494 (patch) | |
tree | 27b5aceda439a3965228d95b45f3ddb69658b0d9 /arch/sh/boards | |
parent | ce932d0c5589e9766e089c22c66890dfc48fbd94 (diff) |
sh: migor evt2irq migration.
Migrate migor to evt2irq backed hwirq lookups.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards')
-rw-r--r-- | arch/sh/boards/mach-migor/setup.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c index ff6f69c6906e..34cd0c5ff2e1 100644 --- a/arch/sh/boards/mach-migor/setup.c +++ b/arch/sh/boards/mach-migor/setup.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
24 | #include <linux/videodev2.h> | 24 | #include <linux/videodev2.h> |
25 | #include <linux/sh_intc.h> | ||
25 | #include <video/sh_mobile_lcdc.h> | 26 | #include <video/sh_mobile_lcdc.h> |
26 | #include <media/sh_mobile_ceu.h> | 27 | #include <media/sh_mobile_ceu.h> |
27 | #include <media/ov772x.h> | 28 | #include <media/ov772x.h> |
@@ -54,7 +55,7 @@ static struct resource smc91x_eth_resources[] = { | |||
54 | .flags = IORESOURCE_MEM, | 55 | .flags = IORESOURCE_MEM, |
55 | }, | 56 | }, |
56 | [1] = { | 57 | [1] = { |
57 | .start = 32, /* IRQ0 */ | 58 | .start = evt2irq(0x600), /* IRQ0 */ |
58 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, | 59 | .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL, |
59 | }, | 60 | }, |
60 | }; | 61 | }; |
@@ -88,7 +89,7 @@ static struct resource sh_keysc_resources[] = { | |||
88 | .flags = IORESOURCE_MEM, | 89 | .flags = IORESOURCE_MEM, |
89 | }, | 90 | }, |
90 | [1] = { | 91 | [1] = { |
91 | .start = 79, | 92 | .start = evt2irq(0xbe0), |
92 | .flags = IORESOURCE_IRQ, | 93 | .flags = IORESOURCE_IRQ, |
93 | }, | 94 | }, |
94 | }; | 95 | }; |
@@ -285,7 +286,7 @@ static struct resource migor_lcdc_resources[] = { | |||
285 | .flags = IORESOURCE_MEM, | 286 | .flags = IORESOURCE_MEM, |
286 | }, | 287 | }, |
287 | [1] = { | 288 | [1] = { |
288 | .start = 28, | 289 | .start = evt2irq(0x580), |
289 | .flags = IORESOURCE_IRQ, | 290 | .flags = IORESOURCE_IRQ, |
290 | }, | 291 | }, |
291 | }; | 292 | }; |
@@ -368,7 +369,7 @@ static struct resource migor_ceu_resources[] = { | |||
368 | .flags = IORESOURCE_MEM, | 369 | .flags = IORESOURCE_MEM, |
369 | }, | 370 | }, |
370 | [1] = { | 371 | [1] = { |
371 | .start = 52, | 372 | .start = evt2irq(0x880), |
372 | .flags = IORESOURCE_IRQ, | 373 | .flags = IORESOURCE_IRQ, |
373 | }, | 374 | }, |
374 | [2] = { | 375 | [2] = { |
@@ -394,7 +395,7 @@ static struct resource sdhi_cn9_resources[] = { | |||
394 | .flags = IORESOURCE_MEM, | 395 | .flags = IORESOURCE_MEM, |
395 | }, | 396 | }, |
396 | [1] = { | 397 | [1] = { |
397 | .start = 100, | 398 | .start = evt2irq(0xe80), |
398 | .flags = IORESOURCE_IRQ, | 399 | .flags = IORESOURCE_IRQ, |
399 | }, | 400 | }, |
400 | }; | 401 | }; |
@@ -420,7 +421,7 @@ static struct i2c_board_info migor_i2c_devices[] = { | |||
420 | }, | 421 | }, |
421 | { | 422 | { |
422 | I2C_BOARD_INFO("migor_ts", 0x51), | 423 | I2C_BOARD_INFO("migor_ts", 0x51), |
423 | .irq = 38, /* IRQ6 */ | 424 | .irq = evt2irq(0x6c0), /* IRQ6 */ |
424 | }, | 425 | }, |
425 | { | 426 | { |
426 | I2C_BOARD_INFO("wm8978", 0x1a), | 427 | I2C_BOARD_INFO("wm8978", 0x1a), |