diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-10-06 14:19:44 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-06 16:52:24 +0000 |
| commit | 898e810eadb16670c800b3279800bda3a822c6d7 (patch) | |
| tree | 35138d7fae28d0cb9bda8405df2c7fe5b5d01fa8 /arch/arm | |
| parent | 7a5b4e16c880f8350d255dc188f81622905618c1 (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')
| -rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index 0b4b8704f9b..a91abd35b8b 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) assign_h3600_egpio = h3100_control_egpio; } +static void h3100_mach_init(void) +{ + h3xxx_mach_init(); +} + MACHINE_START(H3100, "Compaq iPAQ H3100") .phys_io = 0x80000000, .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, @@ -328,7 +333,7 @@ MACHINE_START(H3100, "Compaq iPAQ H3100") .map_io = h3100_map_io, .init_irq = sa1100_init_irq, .timer = &sa1100_timer, - .init_machine = h3xxx_mach_init, + .init_machine = h3100_mach_init, MACHINE_END #endif /* CONFIG_SA1100_H3100 */ @@ -418,6 +423,11 @@ static void __init h3600_map_io(void) assign_h3600_egpio = h3600_control_egpio; } +static void h3600_mach_init(void) +{ + h3xxx_mach_init(); +} + MACHINE_START(H3600, "Compaq iPAQ H3600") .phys_io = 0x80000000, .io_pg_offst = ((0xf8000000) >> 18) & 0xfffc, @@ -425,7 +435,7 @@ MACHINE_START(H3600, "Compaq iPAQ H3600") .map_io = h3600_map_io, .init_irq = sa1100_init_irq, .timer = &sa1100_timer, - .init_machine = h3xxx_mach_init, + .init_machine = h3600_mach_init, MACHINE_END #endif /* CONFIG_SA1100_H3600 */ |