diff options
| author | Rajendra Nayak <rnayak@ti.com> | 2013-05-03 15:37:16 +0530 |
|---|---|---|
| committer | Rajendra Nayak <rnayak@ti.com> | 2013-05-03 15:37:16 +0530 |
| commit | 9324ac8136189ca9ef4db66e196bb048eb186f00 (patch) | |
| tree | d8e3fc1cd9139c84b271ef234178f5ad5ceb1efe | |
| parent | 377e7172ea0d809f506ab63438cc39da82fdf5ed (diff) | |
| download | omap-omapzoom-9324ac8136189ca9ef4db66e196bb048eb186f00.tar.gz | |
ARM: dra: Enable omap4_pm_init for dra
Now that all the issues around sar_base usage in omap-mpuss-init code
are fixed. Enable omap4_pm_init().
Also enable emif to mpu staticdep for now, same as on OMAP5.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/io.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/pm_omap4plus.c | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c index 30e9c507b35a..f8eaede87415 100644 --- a/arch/arm/mach-omap2/io.c +++ b/arch/arm/mach-omap2/io.c @@ -676,11 +676,7 @@ void __init dra7xx_init_late(void) /* Fix me: Add mux late init, once we add the mux data */ omap2_common_pm_late_init(); - /* - * Fix me: Enabling this is aborting. So requires fixing for - * dra7 - */ - //omap4_pm_init(); + omap4_pm_init(); omap2_clk_enable_autoidle_all(); } #endif diff --git a/arch/arm/mach-omap2/pm_omap4plus.c b/arch/arm/mach-omap2/pm_omap4plus.c index d62edf56c9a3..0255cbc69015 100644 --- a/arch/arm/mach-omap2/pm_omap4plus.c +++ b/arch/arm/mach-omap2/pm_omap4plus.c @@ -218,7 +218,7 @@ int __init omap4_pm_init(void) if (cpu_is_omap44xx()) ret = omap4_init_static_deps(); - else if (soc_is_omap54xx()) + else if (soc_is_omap54xx() || soc_is_dra7xx()) ret = omap5_init_static_deps(); if (ret) { |