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/ezx.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/ezx.c')
-rw-r--r-- | arch/arm/mach-pxa/ezx.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/ezx.c b/arch/arm/mach-pxa/ezx.c index 626c82b13970..3fe61f4ac790 100644 --- a/arch/arm/mach-pxa/ezx.c +++ b/arch/arm/mach-pxa/ezx.c | |||
@@ -38,6 +38,8 @@ | |||
38 | #include "devices.h" | 38 | #include "devices.h" |
39 | #include "generic.h" | 39 | #include "generic.h" |
40 | 40 | ||
41 | #define EZX_NR_IRQS (IRQ_BOARD_START + 24) | ||
42 | |||
41 | #define GPIO12_A780_FLIP_LID 12 | 43 | #define GPIO12_A780_FLIP_LID 12 |
42 | #define GPIO15_A1200_FLIP_LID 15 | 44 | #define GPIO15_A1200_FLIP_LID 15 |
43 | #define GPIO15_A910_FLIP_LID 15 | 45 | #define GPIO15_A910_FLIP_LID 15 |
@@ -800,6 +802,7 @@ MACHINE_START(EZX_A780, "Motorola EZX A780") | |||
800 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 802 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
801 | .boot_params = 0xa0000100, | 803 | .boot_params = 0xa0000100, |
802 | .map_io = pxa_map_io, | 804 | .map_io = pxa_map_io, |
805 | .nr_irqs = EZX_NR_IRQS, | ||
803 | .init_irq = pxa27x_init_irq, | 806 | .init_irq = pxa27x_init_irq, |
804 | .timer = &pxa_timer, | 807 | .timer = &pxa_timer, |
805 | .init_machine = a780_init, | 808 | .init_machine = a780_init, |
@@ -866,6 +869,7 @@ MACHINE_START(EZX_E680, "Motorola EZX E680") | |||
866 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 869 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
867 | .boot_params = 0xa0000100, | 870 | .boot_params = 0xa0000100, |
868 | .map_io = pxa_map_io, | 871 | .map_io = pxa_map_io, |
872 | .nr_irqs = EZX_NR_IRQS, | ||
869 | .init_irq = pxa27x_init_irq, | 873 | .init_irq = pxa27x_init_irq, |
870 | .timer = &pxa_timer, | 874 | .timer = &pxa_timer, |
871 | .init_machine = e680_init, | 875 | .init_machine = e680_init, |
@@ -932,6 +936,7 @@ MACHINE_START(EZX_A1200, "Motorola EZX A1200") | |||
932 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 936 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
933 | .boot_params = 0xa0000100, | 937 | .boot_params = 0xa0000100, |
934 | .map_io = pxa_map_io, | 938 | .map_io = pxa_map_io, |
939 | .nr_irqs = EZX_NR_IRQS, | ||
935 | .init_irq = pxa27x_init_irq, | 940 | .init_irq = pxa27x_init_irq, |
936 | .timer = &pxa_timer, | 941 | .timer = &pxa_timer, |
937 | .init_machine = a1200_init, | 942 | .init_machine = a1200_init, |
@@ -1124,6 +1129,7 @@ MACHINE_START(EZX_A910, "Motorola EZX A910") | |||
1124 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 1129 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
1125 | .boot_params = 0xa0000100, | 1130 | .boot_params = 0xa0000100, |
1126 | .map_io = pxa_map_io, | 1131 | .map_io = pxa_map_io, |
1132 | .nr_irqs = EZX_NR_IRQS, | ||
1127 | .init_irq = pxa27x_init_irq, | 1133 | .init_irq = pxa27x_init_irq, |
1128 | .timer = &pxa_timer, | 1134 | .timer = &pxa_timer, |
1129 | .init_machine = a910_init, | 1135 | .init_machine = a910_init, |
@@ -1190,6 +1196,7 @@ MACHINE_START(EZX_E6, "Motorola EZX E6") | |||
1190 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 1196 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
1191 | .boot_params = 0xa0000100, | 1197 | .boot_params = 0xa0000100, |
1192 | .map_io = pxa_map_io, | 1198 | .map_io = pxa_map_io, |
1199 | .nr_irqs = EZX_NR_IRQS, | ||
1193 | .init_irq = pxa27x_init_irq, | 1200 | .init_irq = pxa27x_init_irq, |
1194 | .timer = &pxa_timer, | 1201 | .timer = &pxa_timer, |
1195 | .init_machine = e6_init, | 1202 | .init_machine = e6_init, |
@@ -1230,6 +1237,7 @@ MACHINE_START(EZX_E2, "Motorola EZX E2") | |||
1230 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, | 1237 | .io_pg_offst = (io_p2v(0x40000000) >> 18) & 0xfffc, |
1231 | .boot_params = 0xa0000100, | 1238 | .boot_params = 0xa0000100, |
1232 | .map_io = pxa_map_io, | 1239 | .map_io = pxa_map_io, |
1240 | .nr_irqs = EZX_NR_IRQS, | ||
1233 | .init_irq = pxa27x_init_irq, | 1241 | .init_irq = pxa27x_init_irq, |
1234 | .timer = &pxa_timer, | 1242 | .timer = &pxa_timer, |
1235 | .init_machine = e2_init, | 1243 | .init_machine = e2_init, |