Skip to content

Commit

Permalink
ARM: OMAP3: PRM: move modem reset and iva2 idle to PRM driver
Browse files Browse the repository at this point in the history
Done in preparation to move PRM into its own driver.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
  • Loading branch information
Tero Kristo committed Jul 4, 2014
1 parent bbd36f9 commit c2148e5
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
15 changes: 0 additions & 15 deletions arch/arm/mach-omap2/pm34xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -353,27 +353,12 @@ static int omap3_pm_suspend(void)
#define omap3_pm_suspend NULL
#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)
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/mach-omap2/prm3xxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,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();
}

/**
Expand Down

0 comments on commit c2148e5

Please sign in to comment.