Done in preparation to move PRM into its own driver.
Signed-off-by: Tero Kristo <t-kristo@xxxxxx>
---
arch/arm/mach-omap2/pm34xx.c | 15 ---------------
arch/arm/mach-omap2/prm3xxx.c | 7 +++++++
2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 8df2d65..faa2c05 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -346,27 +346,12 @@ restore:
#endif /* CONFIG_SUSPEND */
-static void __init omap3_d2d_idle(void)
-{
- omap3_ctrl_setup_d2d_padconf();
-
- /* reset modem */
- omap3_prm_reset_modem();
-}
-
static void __init prcm_setup_regs(void)
{
/* XXX This should be handled by hwmod code or SCM init code */
omap_ctrl_writel(OMAP3430_AUTOIDLE_MASK, OMAP2_CONTROL_SYSCONFIG);
omap3_prm_init_pm(cpu_is_omap3630(), omap3_has_iva());
-
- /*
- * We need to idle iva2_pwrdm even on am3703 with no iva2.
- */
- omap3xxx_prm_iva_idle();
-
- omap3_d2d_idle();
}
void omap3_pm_off_mode_enable(int enable)
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c
index eb37970..239163f 100644
--- a/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -361,6 +361,13 @@ void __init omap3_prm_init_pm(bool has_uart4, bool has_iva)
/* Clear any pending PRCM interrupts */
omap2_prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
+
+ /* We need to idle iva2_pwrdm even on am3703 with no iva2. */
+ omap3xxx_prm_iva_idle();
+
+ omap3_ctrl_setup_d2d_padconf();
+
+ omap3_prm_reset_modem();
}
/**
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
