[PATCH 0/1] ARM: OMAP3: Add missing iva2 clken_pll save/restore

[PATCH 0/1] ARM: OMAP3: Add missing iva2 clken_pll save/restore

[Kalle Jokiniemi]

I stumbled upon a register missing from the prcm save/restore
functions. The following patch fixes the issue. Applies on top of latest
pm-branch. Tested on rx-51.

Kalle Jokiniemi (1):
      ARM: OMAP3: Add missing iva2 clken_pll save/restore

 arch/arm/mach-omap2/prcm.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

[PATCH 1/1] ARM: OMAP3: Add missing iva2 clken_pll save/restore

[Kalle Jokiniemi]

The CM_CLKEN_PLL_IVA2 register was not being saved by the
current prcm save/restore code. This patch adds the proper
save/restore for that register.

Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@digia.com>
---
 arch/arm/mach-omap2/prcm.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index a24792a..4f7fd99 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -54,6 +54,7 @@ struct omap3_prcm_regs {
 	u32 pll_cm_clken2;
 	u32 cm_polctrl;
 	u32 iva2_cm_fclken;
+	u32 iva2_cm_clken_pll;
 	u32 core_cm_fclken1;
 	u32 core_cm_fclken3;
 	u32 sgx_cm_fclken;
@@ -260,6 +261,8 @@ void omap3_prcm_save_context(void)
 	prcm_context.cm_polctrl = __raw_readl(OMAP3430_CM_POLCTRL);
 	prcm_context.iva2_cm_fclken =
 			 cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_FCLKEN);
+	prcm_context.iva2_cm_clken_pll = cm_read_mod_reg(OMAP3430_IVA2_MOD,
+			OMAP3430_CM_CLKEN_PLL);
 	prcm_context.core_cm_fclken1 =
 			 cm_read_mod_reg(CORE_MOD, CM_FCLKEN1);
 	prcm_context.core_cm_fclken3 =
@@ -414,6 +417,8 @@ void omap3_prcm_restore_context(void)
 	__raw_writel(prcm_context.cm_polctrl, OMAP3430_CM_POLCTRL);
 	cm_write_mod_reg(prcm_context.iva2_cm_fclken, OMAP3430_IVA2_MOD,
 					 CM_FCLKEN);
+	cm_write_mod_reg(prcm_context.iva2_cm_clken_pll, OMAP3430_IVA2_MOD,
+					OMAP3430_CM_CLKEN_PLL);
 	cm_write_mod_reg(prcm_context.core_cm_fclken1, CORE_MOD, CM_FCLKEN1);
 	cm_write_mod_reg(prcm_context.core_cm_fclken3, CORE_MOD,
 					 OMAP3430ES2_CM_FCLKEN3);
-- 
1.5.4.3

Re: [PATCH 1/1] ARM: OMAP3: Add missing iva2 clken_pll save/restore

[Kevin Hilman]

Kalle Jokiniemi <kalle.jokiniemi@digia.com> writes:

> The CM_CLKEN_PLL_IVA2 register was not being saved by the
> current prcm save/restore code. This patch adds the proper
> save/restore for that register.
>
> Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@digia.com>

Thanks, pushing to PM branch.

Kevin

> ---
>  arch/arm/mach-omap2/prcm.c |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
> index a24792a..4f7fd99 100644
> --- a/arch/arm/mach-omap2/prcm.c
> +++ b/arch/arm/mach-omap2/prcm.c
> @@ -54,6 +54,7 @@ struct omap3_prcm_regs {
>  	u32 pll_cm_clken2;
>  	u32 cm_polctrl;
>  	u32 iva2_cm_fclken;
> +	u32 iva2_cm_clken_pll;
>  	u32 core_cm_fclken1;
>  	u32 core_cm_fclken3;
>  	u32 sgx_cm_fclken;
> @@ -260,6 +261,8 @@ void omap3_prcm_save_context(void)
>  	prcm_context.cm_polctrl = __raw_readl(OMAP3430_CM_POLCTRL);
>  	prcm_context.iva2_cm_fclken =
>  			 cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_FCLKEN);
> +	prcm_context.iva2_cm_clken_pll = cm_read_mod_reg(OMAP3430_IVA2_MOD,
> +			OMAP3430_CM_CLKEN_PLL);
>  	prcm_context.core_cm_fclken1 =
>  			 cm_read_mod_reg(CORE_MOD, CM_FCLKEN1);
>  	prcm_context.core_cm_fclken3 =
> @@ -414,6 +417,8 @@ void omap3_prcm_restore_context(void)
>  	__raw_writel(prcm_context.cm_polctrl, OMAP3430_CM_POLCTRL);
>  	cm_write_mod_reg(prcm_context.iva2_cm_fclken, OMAP3430_IVA2_MOD,
>  					 CM_FCLKEN);
> +	cm_write_mod_reg(prcm_context.iva2_cm_clken_pll, OMAP3430_IVA2_MOD,
> +					OMAP3430_CM_CLKEN_PLL);
>  	cm_write_mod_reg(prcm_context.core_cm_fclken1, CORE_MOD, CM_FCLKEN1);
>  	cm_write_mod_reg(prcm_context.core_cm_fclken3, CORE_MOD,
>  					 OMAP3430ES2_CM_FCLKEN3);
> -- 
> 1.5.4.3