diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-01-20 14:41:41 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-01-20 14:41:41 +0100 |
| commit | 5405520d08b691bfa5bdad395ad72ecbc0979d3b (patch) | |
| tree | 203f4e9f8b00d8adf87d4ca94c9815977981e51b /arch/arm/mach-omap2/io.c | |
| parent | Linux 3.3-rc1 (diff) | |
| parent | ARM: OMAP2+: split omap2/3/4_check_revision function (diff) | |
| download | linux-5405520d08b691bfa5bdad395ad72ecbc0979d3b.tar.xz linux-5405520d08b691bfa5bdad395ad72ecbc0979d3b.zip | |
Merge branch 'soc-part2' into soc
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 3f174d51f67f..81cf60f6bc9c 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -351,7 +351,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) static void __init omap_common_init_early(void) { - omap2_check_revision(); omap_init_consistent_dma_size(); } @@ -392,6 +391,7 @@ static void __init omap_hwmod_init_postsetup(void) void __init omap2420_init_early(void) { omap2_set_globals_242x(); + omap2xxx_check_revision(); omap_common_init_early(); omap2xxx_voltagedomains_init(); omap242x_powerdomains_init(); @@ -404,6 +404,7 @@ void __init omap2420_init_early(void) void __init omap2430_init_early(void) { omap2_set_globals_243x(); + omap2xxx_check_revision(); omap_common_init_early(); omap2xxx_voltagedomains_init(); omap243x_powerdomains_init(); @@ -422,6 +423,8 @@ void __init omap2430_init_early(void) void __init omap3_init_early(void) { omap2_set_globals_3xxx(); + omap3xxx_check_revision(); + omap3xxx_check_features(); omap_common_init_early(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); @@ -454,6 +457,8 @@ void __init am35xx_init_early(void) void __init ti81xx_init_early(void) { omap2_set_globals_ti81xx(); + omap3xxx_check_revision(); + ti81xx_check_features(); omap_common_init_early(); omap3xxx_voltagedomains_init(); omap3xxx_powerdomains_init(); @@ -468,6 +473,8 @@ void __init ti81xx_init_early(void) void __init omap4430_init_early(void) { omap2_set_globals_443x(); + omap4xxx_check_revision(); + omap4xxx_check_features(); omap_common_init_early(); omap44xx_voltagedomains_init(); omap44xx_powerdomains_init(); |