diff options
author | Jouni Hogander <jouni.hogander@nokia.com> | 2009-02-05 06:34:01 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-11-11 17:42:25 -0500 |
commit | 133464dc30846282b5f852433d7b6a31f292f886 (patch) | |
tree | 22fd9add3d33c8a6a2c49d8aaf2fe623524f2187 | |
parent | 13a6fe0f6adf62bf73be055322197507761d160a (diff) |
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 <jouni.hogander@nokia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
-rw-r--r-- | 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 56f77df1ffac..221eed11b73f 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c | |||
@@ -39,6 +39,7 @@ static void __iomem *cm_base; | |||
39 | 39 | ||
40 | struct omap3_prcm_regs { | 40 | struct omap3_prcm_regs { |
41 | u32 control_padconf_sys_nirq; | 41 | u32 control_padconf_sys_nirq; |
42 | u32 iva2_cm_clksel1; | ||
42 | u32 iva2_cm_clksel2; | 43 | u32 iva2_cm_clksel2; |
43 | u32 cm_sysconfig; | 44 | u32 cm_sysconfig; |
44 | u32 sgx_cm_clksel; | 45 | u32 sgx_cm_clksel; |
@@ -262,6 +263,8 @@ void omap3_prcm_save_context(void) | |||
262 | { | 263 | { |
263 | prcm_context.control_padconf_sys_nirq = | 264 | prcm_context.control_padconf_sys_nirq = |
264 | omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ); | 265 | omap_ctrl_readl(OMAP343X_CONTROL_PADCONF_SYSNIRQ); |
266 | prcm_context.iva2_cm_clksel1 = | ||
267 | cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSEL1); | ||
265 | prcm_context.iva2_cm_clksel2 = | 268 | prcm_context.iva2_cm_clksel2 = |
266 | cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSEL2); | 269 | cm_read_mod_reg(OMAP3430_IVA2_MOD, CM_CLKSEL2); |
267 | prcm_context.cm_sysconfig = __raw_readl(OMAP3430_CM_SYSCONFIG); | 270 | prcm_context.cm_sysconfig = __raw_readl(OMAP3430_CM_SYSCONFIG); |
@@ -417,6 +420,8 @@ void omap3_prcm_restore_context(void) | |||
417 | { | 420 | { |
418 | omap_ctrl_writel(prcm_context.control_padconf_sys_nirq, | 421 | omap_ctrl_writel(prcm_context.control_padconf_sys_nirq, |
419 | OMAP343X_CONTROL_PADCONF_SYSNIRQ); | 422 | OMAP343X_CONTROL_PADCONF_SYSNIRQ); |
423 | cm_write_mod_reg(prcm_context.iva2_cm_clksel1, OMAP3430_IVA2_MOD, | ||
424 | CM_CLKSEL1); | ||
420 | cm_write_mod_reg(prcm_context.iva2_cm_clksel2, OMAP3430_IVA2_MOD, | 425 | cm_write_mod_reg(prcm_context.iva2_cm_clksel2, OMAP3430_IVA2_MOD, |
421 | CM_CLKSEL2); | 426 | CM_CLKSEL2); |
422 | __raw_writel(prcm_context.cm_sysconfig, OMAP3430_CM_SYSCONFIG); | 427 | __raw_writel(prcm_context.cm_sysconfig, OMAP3430_CM_SYSCONFIG); |