ARM: OMAP3: PM: Only access IVA if one exists
prcm_setup_regs() blindly accesses IVA bits in the PRM and calls omap3_iva_idle() which does more IVA related register accesses. Only do this if the IVA hardware actually exists. Signed-off-by: Mark A. Greer <mgreer@animalcreek.com> Signed-off-by: Kevin Hilman <khilman@ti.com>
This commit is contained in:
Родитель
f8f5701bda
Коммит
a819c4f16d
|
@ -581,10 +581,13 @@ static void __init prcm_setup_regs(void)
|
||||||
OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL);
|
OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL);
|
||||||
|
|
||||||
/* Don't attach IVA interrupts */
|
/* Don't attach IVA interrupts */
|
||||||
omap2_prm_write_mod_reg(0, WKUP_MOD, OMAP3430_PM_IVAGRPSEL);
|
if (omap3_has_iva()) {
|
||||||
omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430_PM_IVAGRPSEL1);
|
omap2_prm_write_mod_reg(0, WKUP_MOD, OMAP3430_PM_IVAGRPSEL);
|
||||||
omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3);
|
omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430_PM_IVAGRPSEL1);
|
||||||
omap2_prm_write_mod_reg(0, OMAP3430_PER_MOD, OMAP3430_PM_IVAGRPSEL);
|
omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3);
|
||||||
|
omap2_prm_write_mod_reg(0, OMAP3430_PER_MOD,
|
||||||
|
OMAP3430_PM_IVAGRPSEL);
|
||||||
|
}
|
||||||
|
|
||||||
/* Clear any pending 'reset' flags */
|
/* Clear any pending 'reset' flags */
|
||||||
omap2_prm_write_mod_reg(0xffffffff, MPU_MOD, OMAP2_RM_RSTST);
|
omap2_prm_write_mod_reg(0xffffffff, MPU_MOD, OMAP2_RM_RSTST);
|
||||||
|
@ -598,7 +601,9 @@ static void __init prcm_setup_regs(void)
|
||||||
/* Clear any pending PRCM interrupts */
|
/* Clear any pending PRCM interrupts */
|
||||||
omap2_prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
|
omap2_prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);
|
||||||
|
|
||||||
omap3_iva_idle();
|
if (omap3_has_iva())
|
||||||
|
omap3_iva_idle();
|
||||||
|
|
||||||
omap3_d2d_idle();
|
omap3_d2d_idle();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче