aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEduardo Valentin <eduardo.valentin@ti.com>2011-04-13 18:21:06 +0300
committerPaul Walmsley <paul@pwsan.com>2011-04-20 12:43:56 -0600
commit8bc2e98bcb280009cb0f85ce64e5f79b1669f9ff (patch)
tree1be744f64a2d6679bd89666e8c0f4cb003bbff9c
parent2df122f52fd31c327e0aa05caf6017ecd7867d5f (diff)
downloadkernel_samsung_smdk4412-8bc2e98bcb280009cb0f85ce64e5f79b1669f9ff.zip
kernel_samsung_smdk4412-8bc2e98bcb280009cb0f85ce64e5f79b1669f9ff.tar.gz
kernel_samsung_smdk4412-8bc2e98bcb280009cb0f85ce64e5f79b1669f9ff.tar.bz2
OMAP2+: PM: Fix the saving of CM_AUTOIDLE_PLL register on scratchpad area
The saving of CCR.CM_AUTOIDLE_PLL is done in scratchpad area. However, in current code, the saving is done for CM_AUTOIDLE2_PLL (offset 0x34) instead of CM_AUTOIDLE_PLL (offset 0x30). This patch changes the code to save the correct register. Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
-rw-r--r--arch/arm/mach-omap2/control.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index 6952794..df0c75c 100644
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -317,7 +317,7 @@ void omap3_save_scratchpad_contents(void)
prcm_block_contents.cm_clken_pll =
omap2_cm_read_mod_reg(PLL_MOD, CM_CLKEN);
prcm_block_contents.cm_autoidle_pll =
- omap2_cm_read_mod_reg(PLL_MOD, OMAP3430_CM_AUTOIDLE_PLL);
+ omap2_cm_read_mod_reg(PLL_MOD, CM_AUTOIDLE);
prcm_block_contents.cm_clksel1_pll =
omap2_cm_read_mod_reg(PLL_MOD, OMAP3430_CM_CLKSEL1_PLL);
prcm_block_contents.cm_clksel2_pll =