diff options
author | Ambresh K <ambresh@ti.com> | 2013-08-23 06:05:08 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2013-08-23 06:29:37 -0400 |
commit | 7de516a63c634a0db1920757f501f98f68f92716 (patch) | |
tree | af791e2a84361232d28037f53f0bb3224d5bfe04 /arch | |
parent | 90020c7b2c5e02200bc752c8cfeba91c4435588c (diff) |
ARM: OMAP: DRA7: Enable PM framework initializations
Initialise powerdomains, clockdomains, and hwmod frameworks.
Signed-off-by: Ambresh K <ambresh@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
[paul@pwsan.com: updated to apply]
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/io.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-omap2/prm44xx.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 3656b8009a1c..ff2113ce4014 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c | |||
@@ -665,6 +665,11 @@ void __init dra7xx_init_early(void) | |||
665 | omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); | 665 | omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); |
666 | omap_prm_base_init(); | 666 | omap_prm_base_init(); |
667 | omap_cm_base_init(); | 667 | omap_cm_base_init(); |
668 | omap44xx_prm_init(); | ||
669 | dra7xx_powerdomains_init(); | ||
670 | dra7xx_clockdomains_init(); | ||
671 | dra7xx_hwmod_init(); | ||
672 | omap_hwmod_init_postsetup(); | ||
668 | } | 673 | } |
669 | #endif | 674 | #endif |
670 | 675 | ||
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index 15271b6d205f..03a603476cfc 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c | |||
@@ -660,7 +660,7 @@ static struct prm_ll_data omap44xx_prm_ll_data = { | |||
660 | 660 | ||
661 | int __init omap44xx_prm_init(void) | 661 | int __init omap44xx_prm_init(void) |
662 | { | 662 | { |
663 | if (!cpu_is_omap44xx() && !soc_is_omap54xx()) | 663 | if (!cpu_is_omap44xx() && !soc_is_omap54xx() && !soc_is_dra7xx()) |
664 | return 0; | 664 | return 0; |
665 | 665 | ||
666 | return prm_register(&omap44xx_prm_ll_data); | 666 | return prm_register(&omap44xx_prm_ll_data); |