OMAP3: PM: Fix to prcm save/restore
Subsystems (3)
cover OMAP3: PM: Fix to prcm save/restore
This patch should fix the problem in locking DPLL2 after wake-up from OFF mode:
clock: dpll2_ck failed transition to 'locked'
clock: dpll2_ck failed transition to 'locked'
clock: dpll2_ck failed transition to 'locked'
clock: dpll2_ck failed transition to 'locked'
prcm.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
PATCH 1/1 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 Jouni Hogander <[email protected]>
--- arch/arm/mach-omap2/prcm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/prcm.c +5 -0
@@ -36,6 +36,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;
@@ -218,6 +219,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 );
@@ -371,6 +374,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 );
Signature · 1 line
1.6.0.1
Re: [PATCH PM 1/1] OMAP3: PM: Save and restore also CM_CLKSEL1_PLL_IVA2
Quoted 7 lines · Jouni Hogander
CM_CLKSEL1_PLL_IVA2is not saved/restored currently. This patch is adding save and restore for it.Signed-off-by Jouni Hogander <[email protected]>--- arch/arm/mach-omap2/prcm.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-)
Thanks, pushed to pm branch.
Kevin
Quoted 37 lines
arch/arm/mach-omap2/prcm.c +5
-0@@ -36,6 +36,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;@@ -218,6 +219,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 );@@ -371,6 +374,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 );Signature · 6 lines
1.6.0.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html