diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-09-09 02:20:15 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-09-09 02:20:15 +0400 |
| commit | 887782e04f8ada770e24cfb190d2ceed3b2c4974 (patch) | |
| tree | acb6a9ee8b1993d1ca15392897da60512a094dba /arch/arm/mach-omap2/io.c | |
| parent | d7eb67f7fef9c046f27a975118da2324de65a90c (diff) | |
| parent | 628ed4717000789bff827c5799d1aac4c1008541 (diff) | |
| download | linux-887782e04f8ada770e24cfb190d2ceed3b2c4974.tar.xz | |
Merge branch 'pull/v3.18/for-omap-soc' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.18/soc
Diffstat (limited to 'arch/arm/mach-omap2/io.c')
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 5d0667c119f6..2890c2df09f6 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -667,6 +667,7 @@ void __init omap5_init_early(void) omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_AON_BASE), OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE)); omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE)); + omap4_pm_init_early(); omap_prm_base_init(); omap_cm_base_init(); omap44xx_prm_init(); @@ -682,6 +683,8 @@ void __init omap5_init_early(void) void __init omap5_init_late(void) { omap_common_late_init(); + omap4_pm_init(); + omap2_clk_enable_autoidle_all(); } #endif |