lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

omap2+: Make omap_hwmod_late_init into core_initcall

Browse Source 
Otherwise things will fail with early_init changes.

Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren
2011-02-14 15:40:20 -08:00
parent 3dc3bad6f1
commit 44dc046e93
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/io.c
View File

@@ -400,8 +400,6 @@ void __init omap2_init_common_devices(struct omap_sdrc_params *sdrc_cs0,
{ {
omap_serial_early_init(); omap_serial_early_init();
omap_hwmod_late_init();
if (cpu_is_omap24xx() || cpu_is_omap34xx()) { if (cpu_is_omap24xx() || cpu_is_omap34xx()) {
omap2_sdrc_init(sdrc_cs0, sdrc_cs1); omap2_sdrc_init(sdrc_cs0, sdrc_cs1);
_omap2_init_reprogram_sdrc(); _omap2_init_reprogram_sdrc();

3
arch/arm/mach-omap2/omap_hwmod.c
View File

@@ -1628,7 +1628,7 @@ int __init omap_hwmod_init(struct omap_hwmod **ohs)
* to struct clk pointers for each registered omap_hwmod. Also calls * to struct clk pointers for each registered omap_hwmod. Also calls
* _setup() on each hwmod. Returns 0. * _setup() on each hwmod. Returns 0.
*/ */
int omap_hwmod_late_init(void) static int __init omap_hwmod_late_init(void)
{ {
int r; int r;
@@ -1644,6 +1644,7 @@ int omap_hwmod_late_init(void)
return 0; return 0;
} }
core_initcall(omap_hwmod_late_init);
/** /**
* omap_hwmod_enable - enable an omap_hwmod * omap_hwmod_enable - enable an omap_hwmod

1
arch/arm/plat-omap/include/plat/omap_hwmod.h
View File

@@ -539,7 +539,6 @@ int omap_hwmod_init(struct omap_hwmod **ohs);
struct omap_hwmod *omap_hwmod_lookup(const char *name); struct omap_hwmod *omap_hwmod_lookup(const char *name);
int omap_hwmod_for_each(int (*fn)(struct omap_hwmod *oh, void *data), int omap_hwmod_for_each(int (*fn)(struct omap_hwmod *oh, void *data),
void *data); void *data);
int omap_hwmod_late_init(void);
int omap_hwmod_enable(struct omap_hwmod *oh); int omap_hwmod_enable(struct omap_hwmod *oh);
int _omap_hwmod_enable(struct omap_hwmod *oh); int _omap_hwmod_enable(struct omap_hwmod *oh);