diff options
author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2010-08-20 03:23:59 -0400 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2010-10-08 04:21:17 -0400 |
commit | 6ac6b817f3f4c23c5febd960d8deb343e13af5f3 (patch) | |
tree | 9d5642b9699e3d0dd8bcc2a1483a8ff3c31e4cf4 /arch/arm/mach-pxa/eseries.c | |
parent | 1b43d8eda71bc953c9005afd63952e0666169553 (diff) |
ARM: pxa: encode IRQ number into .nr_irqs
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/eseries.c')
-rw-r--r-- | arch/arm/mach-pxa/eseries.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index 349212a1cbd3..4971ce119501 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c | |||
@@ -29,6 +29,7 @@ | |||
29 | 29 | ||
30 | #include <mach/pxa25x.h> | 30 | #include <mach/pxa25x.h> |
31 | #include <mach/eseries-gpio.h> | 31 | #include <mach/eseries-gpio.h> |
32 | #include <mach/eseries-irq.h> | ||
32 | #include <mach/audio.h> | 33 | #include <mach/audio.h> |
33 | #include <mach/pxafb.h> | 34 | #include <mach/pxafb.h> |
34 | #include <mach/udc.h> | 35 | #include <mach/udc.h> |
@@ -183,6 +184,7 @@ MACHINE_START(E330, "Toshiba e330") | |||
183 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 184 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
184 | .boot_params = 0xa0000100, | 185 | .boot_params = 0xa0000100, |
185 | .map_io = pxa_map_io, | 186 | .map_io = pxa_map_io, |
187 | .nr_irqs = ESERIES_NR_IRQS, | ||
186 | .init_irq = pxa25x_init_irq, | 188 | .init_irq = pxa25x_init_irq, |
187 | .fixup = eseries_fixup, | 189 | .fixup = eseries_fixup, |
188 | .init_machine = e330_init, | 190 | .init_machine = e330_init, |
@@ -233,6 +235,7 @@ MACHINE_START(E350, "Toshiba e350") | |||
233 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 235 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
234 | .boot_params = 0xa0000100, | 236 | .boot_params = 0xa0000100, |
235 | .map_io = pxa_map_io, | 237 | .map_io = pxa_map_io, |
238 | .nr_irqs = ESERIES_NR_IRQS, | ||
236 | .init_irq = pxa25x_init_irq, | 239 | .init_irq = pxa25x_init_irq, |
237 | .fixup = eseries_fixup, | 240 | .fixup = eseries_fixup, |
238 | .init_machine = e350_init, | 241 | .init_machine = e350_init, |
@@ -356,6 +359,7 @@ MACHINE_START(E400, "Toshiba e400") | |||
356 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 359 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
357 | .boot_params = 0xa0000100, | 360 | .boot_params = 0xa0000100, |
358 | .map_io = pxa_map_io, | 361 | .map_io = pxa_map_io, |
362 | .nr_irqs = ESERIES_NR_IRQS, | ||
359 | .init_irq = pxa25x_init_irq, | 363 | .init_irq = pxa25x_init_irq, |
360 | .fixup = eseries_fixup, | 364 | .fixup = eseries_fixup, |
361 | .init_machine = e400_init, | 365 | .init_machine = e400_init, |
@@ -545,6 +549,7 @@ MACHINE_START(E740, "Toshiba e740") | |||
545 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 549 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
546 | .boot_params = 0xa0000100, | 550 | .boot_params = 0xa0000100, |
547 | .map_io = pxa_map_io, | 551 | .map_io = pxa_map_io, |
552 | .nr_irqs = ESERIES_NR_IRQS, | ||
548 | .init_irq = pxa25x_init_irq, | 553 | .init_irq = pxa25x_init_irq, |
549 | .fixup = eseries_fixup, | 554 | .fixup = eseries_fixup, |
550 | .init_machine = e740_init, | 555 | .init_machine = e740_init, |
@@ -737,6 +742,7 @@ MACHINE_START(E750, "Toshiba e750") | |||
737 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 742 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
738 | .boot_params = 0xa0000100, | 743 | .boot_params = 0xa0000100, |
739 | .map_io = pxa_map_io, | 744 | .map_io = pxa_map_io, |
745 | .nr_irqs = ESERIES_NR_IRQS, | ||
740 | .init_irq = pxa25x_init_irq, | 746 | .init_irq = pxa25x_init_irq, |
741 | .fixup = eseries_fixup, | 747 | .fixup = eseries_fixup, |
742 | .init_machine = e750_init, | 748 | .init_machine = e750_init, |
@@ -933,6 +939,7 @@ MACHINE_START(E800, "Toshiba e800") | |||
933 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 939 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
934 | .boot_params = 0xa0000100, | 940 | .boot_params = 0xa0000100, |
935 | .map_io = pxa_map_io, | 941 | .map_io = pxa_map_io, |
942 | .nr_irqs = ESERIES_NR_IRQS, | ||
936 | .init_irq = pxa25x_init_irq, | 943 | .init_irq = pxa25x_init_irq, |
937 | .fixup = eseries_fixup, | 944 | .fixup = eseries_fixup, |
938 | .init_machine = e800_init, | 945 | .init_machine = e800_init, |