diff options
author | Vaibhav Hiremath <hvaibhav@ti.com> | 2011-12-19 05:20:15 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2011-12-19 18:47:14 -0500 |
commit | 4de34f3572882fd0a0e655cda494577c22663215 (patch) | |
tree | bacfc1653577ac6470d7e99e7d1c21931157dc80 /arch/arm/mach-omap2/io.c | |
parent | 50a01e6440020877c2f71bc5ac4d818d9b8f31c1 (diff) |
ARM: OMAP2+: split omap2/3/4_check_revision function
We need to detect the SoC revision early, but the SoC
feature detection can be done later on. In order to allow
further clean-up later on, this patch separates the SoC
revision check from the SoC feature check.
This patch doesn't change functionality or behavior of the code
execution; it barely cleans up the code and splits into SoC
specific implementation for Rev ID and feature detection.
Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren <tony@atomide.com>
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 73d617f0dc4a..58bd138e5a98 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -342,7 +342,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) | |||
342 | 342 | ||
343 | static void __init omap_common_init_early(void) | 343 | static void __init omap_common_init_early(void) |
344 | { | 344 | { |
345 | omap2_check_revision(); | ||
346 | omap_init_consistent_dma_size(); | 345 | omap_init_consistent_dma_size(); |
347 | } | 346 | } |
348 | 347 | ||
@@ -383,6 +382,7 @@ static void __init omap_hwmod_init_postsetup(void) | |||
383 | void __init omap2420_init_early(void) | 382 | void __init omap2420_init_early(void) |
384 | { | 383 | { |
385 | omap2_set_globals_242x(); | 384 | omap2_set_globals_242x(); |
385 | omap2xxx_check_revision(); | ||
386 | omap_common_init_early(); | 386 | omap_common_init_early(); |
387 | omap2xxx_voltagedomains_init(); | 387 | omap2xxx_voltagedomains_init(); |
388 | omap242x_powerdomains_init(); | 388 | omap242x_powerdomains_init(); |
@@ -395,6 +395,7 @@ void __init omap2420_init_early(void) | |||
395 | void __init omap2430_init_early(void) | 395 | void __init omap2430_init_early(void) |
396 | { | 396 | { |
397 | omap2_set_globals_243x(); | 397 | omap2_set_globals_243x(); |
398 | omap2xxx_check_revision(); | ||
398 | omap_common_init_early(); | 399 | omap_common_init_early(); |
399 | omap2xxx_voltagedomains_init(); | 400 | omap2xxx_voltagedomains_init(); |
400 | omap243x_powerdomains_init(); | 401 | omap243x_powerdomains_init(); |
@@ -413,6 +414,8 @@ void __init omap2430_init_early(void) | |||
413 | void __init omap3_init_early(void) | 414 | void __init omap3_init_early(void) |
414 | { | 415 | { |
415 | omap2_set_globals_3xxx(); | 416 | omap2_set_globals_3xxx(); |
417 | omap3xxx_check_revision(); | ||
418 | omap3xxx_check_features(); | ||
416 | omap_common_init_early(); | 419 | omap_common_init_early(); |
417 | omap3xxx_voltagedomains_init(); | 420 | omap3xxx_voltagedomains_init(); |
418 | omap3xxx_powerdomains_init(); | 421 | omap3xxx_powerdomains_init(); |
@@ -445,6 +448,8 @@ void __init am35xx_init_early(void) | |||
445 | void __init ti81xx_init_early(void) | 448 | void __init ti81xx_init_early(void) |
446 | { | 449 | { |
447 | omap2_set_globals_ti81xx(); | 450 | omap2_set_globals_ti81xx(); |
451 | omap3xxx_check_revision(); | ||
452 | ti81xx_check_features(); | ||
448 | omap_common_init_early(); | 453 | omap_common_init_early(); |
449 | omap3xxx_voltagedomains_init(); | 454 | omap3xxx_voltagedomains_init(); |
450 | omap3xxx_powerdomains_init(); | 455 | omap3xxx_powerdomains_init(); |
@@ -459,6 +464,8 @@ void __init ti81xx_init_early(void) | |||
459 | void __init omap4430_init_early(void) | 464 | void __init omap4430_init_early(void) |
460 | { | 465 | { |
461 | omap2_set_globals_443x(); | 466 | omap2_set_globals_443x(); |
467 | omap4xxx_check_revision(); | ||
468 | omap4xxx_check_features(); | ||
462 | omap_common_init_early(); | 469 | omap_common_init_early(); |
463 | omap44xx_voltagedomains_init(); | 470 | omap44xx_voltagedomains_init(); |
464 | omap44xx_powerdomains_init(); | 471 | omap44xx_powerdomains_init(); |