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

Commit 133464dc authored by Jouni Hogander's avatar Jouni Hogander Committed by Kevin Hilman
Browse files

OMAP3: PM: Save and restore also CM_CLKSEL1_PLL_IVA2 



CM_CLKSEL1_PLL_IVA2 is not saved/restored currently. This patch is
adding save and restore for it.

Signed-off-by: default avatarJouni Hogander <jouni.hogander@nokia.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 13a6fe0f

arch/arm/mach-omap2/prcm.c

+5 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ static void __iomem *cm_base; 


struct omap3_prcm_regs {

	u32 control_padconf_sys_nirq;

	u32 iva2_cm_clksel1;

	u32 iva2_cm_clksel2;

	u32 cm_sysconfig;

	u32 sgx_cm_clksel;
@@ -262,6 +263,8 @@ void omap3_prcm_save_context(void) 
{

	prcm_context.control_padconf_sys_nirq =

			 omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ);

	prcm_context.iva2_cm_clksel1 =

			 cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSEL1);

	prcm_context.iva2_cm_clksel2 =

			 cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSEL2);

	prcm_context.cm_sysconfig = __raw_readl(OMAP3430_CM_SYSCONFIG);
@@ -417,6 +420,8 @@ void omap3_prcm_restore_context(void) 
{

	omap_ctrl_writel(prcm_context.control_padconf_sys_nirq,

					 OMAP343X_CONTROL_PADCONF_SYSNIRQ);

	cm_write_mod_reg(prcm_context.iva2_cm_clksel1, OMAP3430_IVA2_MOD,

					 CM_CLKSEL1);

	cm_write_mod_reg(prcm_context.iva2_cm_clksel2, OMAP3430_IVA2_MOD,

					 CM_CLKSEL2);

	__raw_writel(prcm_context.cm_sysconfig, OMAP3430_CM_SYSCONFIG);