diff options
author | Cyril Chemparathy <cyril@ti.com> | 2010-05-07 17:06:37 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-05-13 13:05:28 -0400 |
commit | bd808947040ba53b2b0e52dde598a9414fb27bba (patch) | |
tree | 868535ab01e9a7a754d255c77b2ab839f8b4f3ca /arch/arm/mach-davinci/board-dm355-leopard.c | |
parent | e4c822c7e98cdda78b10a696b030fc20b22dcab4 (diff) |
Davinci: aintc/cpintc - use ioremap()
This patch implements the following:
- interrupt initialization uses ioremap() instead of passing a virtual address
via davinci_soc_info.
- machine definitions directly point to cp_intc_init() or davinci_irq_init()
- davinci_intc_type and davinci_intc_base now get initialized in controller
specific init functions instead of davinci_common_init()
- minor fix in davinci_irq_init() to use intc_irq_num instead of
DAVINCI_N_AINTC_IRQ
Signed-off-by: Cyril Chemparathy <cyril@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/board-dm355-leopard.c')
-rw-r--r-- | arch/arm/mach-davinci/board-dm355-leopard.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c index c3d5a70a7f38..f1d8132cf0c3 100644 --- a/arch/arm/mach-davinci/board-dm355-leopard.c +++ b/arch/arm/mach-davinci/board-dm355-leopard.c | |||
@@ -269,17 +269,12 @@ static __init void dm355_leopard_init(void) | |||
269 | ARRAY_SIZE(dm355_leopard_spi_info)); | 269 | ARRAY_SIZE(dm355_leopard_spi_info)); |
270 | } | 270 | } |
271 | 271 | ||
272 | static __init void dm355_leopard_irq_init(void) | ||
273 | { | ||
274 | davinci_irq_init(); | ||
275 | } | ||
276 | |||
277 | MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard") | 272 | MACHINE_START(DM355_LEOPARD, "DaVinci DM355 leopard") |
278 | .phys_io = IO_PHYS, | 273 | .phys_io = IO_PHYS, |
279 | .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc, | 274 | .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc, |
280 | .boot_params = (0x80000100), | 275 | .boot_params = (0x80000100), |
281 | .map_io = dm355_leopard_map_io, | 276 | .map_io = dm355_leopard_map_io, |
282 | .init_irq = dm355_leopard_irq_init, | 277 | .init_irq = davinci_irq_init, |
283 | .timer = &davinci_timer, | 278 | .timer = &davinci_timer, |
284 | .init_machine = dm355_leopard_init, | 279 | .init_machine = dm355_leopard_init, |
285 | MACHINE_END | 280 | MACHINE_END |