diff options
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 7632dfead166..c3fa739ab4c8 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
| @@ -387,7 +387,6 @@ void __init omap2420_init_early(void) | |||
| 387 | omap2_control_base_init(); | 387 | omap2_control_base_init(); |
| 388 | omap2xxx_check_revision(); | 388 | omap2xxx_check_revision(); |
| 389 | omap2_prcm_base_init(); | 389 | omap2_prcm_base_init(); |
| 390 | omap2xxx_cm_init(); | ||
| 391 | omap2xxx_voltagedomains_init(); | 390 | omap2xxx_voltagedomains_init(); |
| 392 | omap242x_powerdomains_init(); | 391 | omap242x_powerdomains_init(); |
| 393 | omap242x_clockdomains_init(); | 392 | omap242x_clockdomains_init(); |
| @@ -414,7 +413,6 @@ void __init omap2430_init_early(void) | |||
| 414 | omap2_control_base_init(); | 413 | omap2_control_base_init(); |
| 415 | omap2xxx_check_revision(); | 414 | omap2xxx_check_revision(); |
| 416 | omap2_prcm_base_init(); | 415 | omap2_prcm_base_init(); |
| 417 | omap2xxx_cm_init(); | ||
| 418 | omap2xxx_voltagedomains_init(); | 416 | omap2xxx_voltagedomains_init(); |
| 419 | omap243x_powerdomains_init(); | 417 | omap243x_powerdomains_init(); |
| 420 | omap243x_clockdomains_init(); | 418 | omap243x_clockdomains_init(); |
| @@ -454,8 +452,11 @@ void __init omap3_init_early(void) | |||
| 454 | omap3xxx_check_revision(); | 452 | omap3xxx_check_revision(); |
| 455 | omap3xxx_check_features(); | 453 | omap3xxx_check_features(); |
| 456 | omap2_prcm_base_init(); | 454 | omap2_prcm_base_init(); |
| 457 | omap3xxx_prm_init(NULL); | 455 | /* XXX: remove these once OMAP3 is DT only */ |
| 458 | omap3xxx_cm_init(); | 456 | if (!of_have_populated_dt()) { |
| 457 | omap3xxx_prm_init(NULL); | ||
| 458 | omap3xxx_cm_init(NULL); | ||
| 459 | } | ||
| 459 | omap3xxx_voltagedomains_init(); | 460 | omap3xxx_voltagedomains_init(); |
| 460 | omap3xxx_powerdomains_init(); | 461 | omap3xxx_powerdomains_init(); |
| 461 | omap3xxx_clockdomains_init(); | 462 | omap3xxx_clockdomains_init(); |
| @@ -553,7 +554,6 @@ void __init ti814x_init_early(void) | |||
| 553 | omap3xxx_check_revision(); | 554 | omap3xxx_check_revision(); |
| 554 | ti81xx_check_features(); | 555 | ti81xx_check_features(); |
| 555 | omap2_prcm_base_init(); | 556 | omap2_prcm_base_init(); |
| 556 | am33xx_cm_init(); | ||
| 557 | omap3xxx_voltagedomains_init(); | 557 | omap3xxx_voltagedomains_init(); |
| 558 | omap3xxx_powerdomains_init(); | 558 | omap3xxx_powerdomains_init(); |
| 559 | ti81xx_clockdomains_init(); | 559 | ti81xx_clockdomains_init(); |
| @@ -571,7 +571,6 @@ void __init ti816x_init_early(void) | |||
| 571 | omap3xxx_check_revision(); | 571 | omap3xxx_check_revision(); |
| 572 | ti81xx_check_features(); | 572 | ti81xx_check_features(); |
| 573 | omap2_prcm_base_init(); | 573 | omap2_prcm_base_init(); |
| 574 | am33xx_cm_init(); | ||
| 575 | omap3xxx_voltagedomains_init(); | 574 | omap3xxx_voltagedomains_init(); |
| 576 | omap3xxx_powerdomains_init(); | 575 | omap3xxx_powerdomains_init(); |
| 577 | ti81xx_clockdomains_init(); | 576 | ti81xx_clockdomains_init(); |
| @@ -591,7 +590,6 @@ void __init am33xx_init_early(void) | |||
| 591 | omap3xxx_check_revision(); | 590 | omap3xxx_check_revision(); |
| 592 | am33xx_check_features(); | 591 | am33xx_check_features(); |
| 593 | omap2_prcm_base_init(); | 592 | omap2_prcm_base_init(); |
| 594 | am33xx_cm_init(); | ||
| 595 | am33xx_powerdomains_init(); | 593 | am33xx_powerdomains_init(); |
| 596 | am33xx_clockdomains_init(); | 594 | am33xx_clockdomains_init(); |
| 597 | am33xx_hwmod_init(); | 595 | am33xx_hwmod_init(); |
| @@ -614,7 +612,6 @@ void __init am43xx_init_early(void) | |||
| 614 | omap3xxx_check_revision(); | 612 | omap3xxx_check_revision(); |
| 615 | am33xx_check_features(); | 613 | am33xx_check_features(); |
| 616 | omap2_prcm_base_init(); | 614 | omap2_prcm_base_init(); |
| 617 | omap4_cm_init(); | ||
| 618 | am43xx_powerdomains_init(); | 615 | am43xx_powerdomains_init(); |
| 619 | am43xx_clockdomains_init(); | 616 | am43xx_clockdomains_init(); |
| 620 | am43xx_hwmod_init(); | 617 | am43xx_hwmod_init(); |
| @@ -640,7 +637,6 @@ void __init omap4430_init_early(void) | |||
| 640 | omap4xxx_check_revision(); | 637 | omap4xxx_check_revision(); |
| 641 | omap4xxx_check_features(); | 638 | omap4xxx_check_features(); |
| 642 | omap2_prcm_base_init(); | 639 | omap2_prcm_base_init(); |
| 643 | omap4_cm_init(); | ||
| 644 | omap4_pm_init_early(); | 640 | omap4_pm_init_early(); |
| 645 | omap44xx_voltagedomains_init(); | 641 | omap44xx_voltagedomains_init(); |
| 646 | omap44xx_powerdomains_init(); | 642 | omap44xx_powerdomains_init(); |
| @@ -670,7 +666,6 @@ void __init omap5_init_early(void) | |||
| 670 | omap4_pm_init_early(); | 666 | omap4_pm_init_early(); |
| 671 | omap2_prcm_base_init(); | 667 | omap2_prcm_base_init(); |
| 672 | omap5xxx_check_revision(); | 668 | omap5xxx_check_revision(); |
| 673 | omap4_cm_init(); | ||
| 674 | omap54xx_voltagedomains_init(); | 669 | omap54xx_voltagedomains_init(); |
| 675 | omap54xx_powerdomains_init(); | 670 | omap54xx_powerdomains_init(); |
| 676 | omap54xx_clockdomains_init(); | 671 | omap54xx_clockdomains_init(); |
| @@ -697,7 +692,6 @@ void __init dra7xx_init_early(void) | |||
| 697 | omap4_pm_init_early(); | 692 | omap4_pm_init_early(); |
| 698 | omap2_prcm_base_init(); | 693 | omap2_prcm_base_init(); |
| 699 | dra7xxx_check_revision(); | 694 | dra7xxx_check_revision(); |
| 700 | omap4_cm_init(); | ||
| 701 | dra7xx_powerdomains_init(); | 695 | dra7xx_powerdomains_init(); |
| 702 | dra7xx_clockdomains_init(); | 696 | dra7xx_clockdomains_init(); |
| 703 | dra7xx_hwmod_init(); | 697 | dra7xx_hwmod_init(); |