Skip to content

Commit

Permalink
ARM: omap1: use machine specific hook for late init
Browse files Browse the repository at this point in the history 
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Shawn Guo committed May 8, 2012
1 parent c633c53 commit 82c3bd0
Show file tree
Hide file tree
Showing 18 changed files with 37 additions and 3 deletions.
8 changes: 7 additions & 1 deletion arch/arm/mach-omap1/board-ams-delta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,12 @@ static int __init late_init(void)
gpio_free(AMS_DELTA_GPIO_PIN_MODEM_IRQ);
return err;
}
late_initcall(late_init);

static void __init ams_delta_init_late(void)
{
omap1_init_late();
late_init();
}

static void __init ams_delta_map_io(void)
{
Expand All @@ -611,6 +616,7 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = ams_delta_init,
.init_late = ams_delta_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-fsample.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,7 @@ MACHINE_START(OMAP_FSAMPLE, "OMAP730 F-Sample")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = omap_fsample_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-generic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = omap_generic_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-h2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ MACHINE_START(OMAP_H2, "TI-H2")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = h2_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-h3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ MACHINE_START(OMAP_H3, "TI OMAP1710 H3 board")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = h3_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-htcherald.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,6 +605,7 @@ MACHINE_START(HERALD, "HTC Herald")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = htcherald_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-innovator.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ MACHINE_START(OMAP_INNOVATOR, "TI-Innovator")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = innovator_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-nokia770.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ MACHINE_START(NOKIA770, "Nokia 770")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = omap_nokia770_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-osk.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,7 @@ MACHINE_START(OMAP_OSK, "TI-OSK")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = osk_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-palmte.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = omap_palmte_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-palmtt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,7 @@ MACHINE_START(OMAP_PALMTT, "OMAP1510 based Palm Tungsten|T")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = omap_palmtt_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-palmz71.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -330,6 +330,7 @@ MACHINE_START(OMAP_PALMZ71, "OMAP310 based Palm Zire71")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = omap_palmz71_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-perseus2.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = omap_perseus2_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-sx1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,7 @@ MACHINE_START(SX1, "OMAP310 based Siemens SX1")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = omap_sx1_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = omap1_restart,
MACHINE_END
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/board-voiceblue.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,7 @@ MACHINE_START(VOICEBLUE, "VoiceBlue OMAP5910")
.reserve = omap_reserve,
.init_irq = omap1_init_irq,
.init_machine = voiceblue_init,
.init_late = omap1_init_late,
.timer = &omap1_timer,
.restart = voiceblue_restart,
MACHINE_END
10 changes: 10 additions & 0 deletions arch/arm/mach-omap1/common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,18 @@ static inline void omap16xx_map_io(void)
}
#endif

#ifdef CONFIG_OMAP_SERIAL_WAKE
int omap_serial_wakeup_init(void);
#else
static inline int omap_serial_wakeup_init(void)
{
return 0;
}
#endif

void omap1_init_early(void);
void omap1_init_irq(void);
void omap1_init_late(void);
void omap1_restart(char, const char *);

extern struct sys_timer omap1_timer;
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/mach-omap1/io.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ void __init omap1_init_early(void)
omap_init_consistent_dma_size();
}

void __init omap1_init_late(void)
{
omap_serial_wakeup_init();
}

/*
* NOTE: Please use ioremap + __raw_read/write where possible instead of these
*/
Expand Down
3 changes: 1 addition & 2 deletions arch/arm/mach-omap1/serial.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr)
enable_irq_wake(gpio_to_irq(gpio_nr));
}

static int __init omap_serial_wakeup_init(void)
int __init omap_serial_wakeup_init(void)
{
if (!cpu_is_omap16xx())
return 0;
Expand All @@ -251,7 +251,6 @@ static int __init omap_serial_wakeup_init(void)

return 0;
}
late_initcall(omap_serial_wakeup_init);

#endif /* CONFIG_OMAP_SERIAL_WAKE */

Expand Down

0 comments on commit 82c3bd0

Please sign in to comment.