aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sa1100/h3600.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-10-06 09:19:44 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-06 11:52:24 -0500
commit898e810eadb16670c800b3279800bda3a822c6d7 (patch)
tree35138d7fae28d0cb9bda8405df2c7fe5b5d01fa8 /arch/arm/mach-sa1100/h3600.c
parent7a5b4e16c880f8350d255dc188f81622905618c1 (diff)
ARM: h3600: provide each iPAQ machine type with own init function
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100/h3600.c')
-rw-r--r--arch/arm/mach-sa1100/h3600.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c
index 0b4b8704f9b3..a91abd35b8be 100644
--- a/arch/arm/mach-sa1100/h3600.c
+++ b/arch/arm/mach-sa1100/h3600.c
@@ -321,6 +321,11 @@ static void __init h3100_map_io(void)
321 assign_h3600_egpio = h3100_control_egpio; 321 assign_h3600_egpio = h3100_control_egpio;
322} 322}
323 323
324static void h3100_mach_init(void)
325{
326 h3xxx_mach_init();
327}
328
324MACHINE_START(H3100, "Compaq iPAQ H3100") 329MACHINE_START(H3100, "Compaq iPAQ H3100")
325 .phys_io = 0x80000000, 330 .phys_io = 0x80000000,
326 .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, 331 .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
@@ -328,7 +333,7 @@ MACHINE_START(H3100, "Compaq iPAQ H3100")
328 .map_io = h3100_map_io, 333 .map_io = h3100_map_io,
329 .init_irq = sa1100_init_irq, 334 .init_irq = sa1100_init_irq,
330 .timer = &sa1100_timer, 335 .timer = &sa1100_timer,
331 .init_machine = h3xxx_mach_init, 336 .init_machine = h3100_mach_init,
332MACHINE_END 337MACHINE_END
333 338
334#endif /* CONFIG_SA1100_H3100 */ 339#endif /* CONFIG_SA1100_H3100 */
@@ -418,6 +423,11 @@ static void __init h3600_map_io(void)
418 assign_h3600_egpio = h3600_control_egpio; 423 assign_h3600_egpio = h3600_control_egpio;
419} 424}
420 425
426static void h3600_mach_init(void)
427{
428 h3xxx_mach_init();
429}
430
421MACHINE_START(H3600, "Compaq iPAQ H3600") 431MACHINE_START(H3600, "Compaq iPAQ H3600")
422 .phys_io = 0x80000000, 432 .phys_io = 0x80000000,
423 .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, 433 .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc,
@@ -425,7 +435,7 @@ MACHINE_START(H3600, "Compaq iPAQ H3600")
425 .map_io = h3600_map_io, 435 .map_io = h3600_map_io,
426 .init_irq = sa1100_init_irq, 436 .init_irq = sa1100_init_irq,
427 .timer = &sa1100_timer, 437 .timer = &sa1100_timer,
428 .init_machine = h3xxx_mach_init, 438 .init_machine = h3600_mach_init,
429MACHINE_END 439MACHINE_END
430 440
431#endif /* CONFIG_SA1100_H3600 */ 441#endif /* CONFIG_SA1100_H3600 */