Merge tag 'clk-for-linus-3.18' of git://git.linaro.org/people/mike.turquette/linux

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-omap2 / io.c

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index a1b82a994842b51c20e4dfccdac7f752c4d740c1..03cbb16898a3f0eeef87144ea70f5b8d96849650 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -231,15 +231,6 @@ static struct map_desc omap44xx_io_desc[] __initdata = {
                .length         = L4_PER_44XX_SIZE,
                .type           = MT_DEVICE,
        },
-#ifdef CONFIG_OMAP4_ERRATA_I688
-       {
-               .virtual        = OMAP4_SRAM_VA,
-               .pfn            = __phys_to_pfn(OMAP4_SRAM_PA),
-               .length         = PAGE_SIZE,
-               .type           = MT_MEMORY_RW_SO,
-       },
-#endif
-
 };
 #endif
 
@@ -269,14 +260,6 @@ static struct map_desc omap54xx_io_desc[] __initdata = {
                .length         = L4_PER_54XX_SIZE,
                .type           = MT_DEVICE,
        },
-#ifdef CONFIG_OMAP4_ERRATA_I688
-       {
-               .virtual        = OMAP4_SRAM_VA,
-               .pfn            = __phys_to_pfn(OMAP4_SRAM_PA),
-               .length         = PAGE_SIZE,
-               .type           = MT_MEMORY_RW_SO,
-       },
-#endif
 };
 #endif
 
@@ -667,6 +650,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 +666,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
 
@@ -695,6 +681,7 @@ void __init dra7xx_init_early(void)
        omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(DRA7XX_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();
@@ -709,6 +696,8 @@ void __init dra7xx_init_early(void)
 void __init dra7xx_init_late(void)
 {
        omap_common_late_init();
+       omap4_pm_init();
+       omap2_clk_enable_autoidle_all();
 }
 #endif