Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a819c4f1 authored by Mark A. Greer's avatar Mark A. Greer Committed by Kevin Hilman
Browse files

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: default avatarMark A. Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent f8f5701b

arch/arm/mach-omap2/pm34xx.c

+10 −5
Original line number Diff line number Diff line
@@ -581,10 +581,13 @@ static void __init prcm_setup_regs(void) 
			  OMAP3430_PER_MOD, OMAP3430_PM_MPUGRPSEL);



	/* Don't attach IVA interrupts */

	if (omap3_has_iva()) {

		omap2_prm_write_mod_reg(0, WKUP_MOD, OMAP3430_PM_IVAGRPSEL);

		omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430_PM_IVAGRPSEL1);

		omap2_prm_write_mod_reg(0, CORE_MOD, OMAP3430ES2_PM_IVAGRPSEL3);

	omap2_prm_write_mod_reg(0, OMAP3430_PER_MOD, OMAP3430_PM_IVAGRPSEL);

		omap2_prm_write_mod_reg(0, OMAP3430_PER_MOD,

					OMAP3430_PM_IVAGRPSEL);

	}



	/* Clear any pending 'reset' flags */

	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 */

	omap2_prm_write_mod_reg(0, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);



	if (omap3_has_iva())

		omap3_iva_idle();



	omap3_d2d_idle();

}