diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-omap2/sleep34xx.S | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index a81ed251e667..c45b4fa1deeb 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c | |||
@@ -146,7 +146,7 @@ static void omap3_core_save_context(void) | |||
146 | 146 | ||
147 | /* | 147 | /* |
148 | * Force write last pad into memory, as this can fail in some | 148 | * Force write last pad into memory, as this can fail in some |
149 | * cases according to erratas 1.157, 1.185 | 149 | * cases according to errata 1.157, 1.185 |
150 | */ | 150 | */ |
151 | omap_ctrl_writel(omap_ctrl_readl(OMAP343X_PADCONF_ETK_D14), | 151 | omap_ctrl_writel(omap_ctrl_readl(OMAP343X_PADCONF_ETK_D14), |
152 | OMAP343X_CONTROL_MEM_WKUP + 0x2a0); | 152 | OMAP343X_CONTROL_MEM_WKUP + 0x2a0); |
@@ -433,7 +433,7 @@ void omap_sram_idle(void) | |||
433 | /* | 433 | /* |
434 | * On EMU/HS devices ROM code restores a SRDC value | 434 | * On EMU/HS devices ROM code restores a SRDC value |
435 | * from scratchpad which has automatic self refresh on timeout | 435 | * from scratchpad which has automatic self refresh on timeout |
436 | * of AUTO_CNT = 1 enabled. This takes care of errata 1.142. | 436 | * of AUTO_CNT = 1 enabled. This takes care of erratum ID i443. |
437 | * Hence store/restore the SDRC_POWER register here. | 437 | * Hence store/restore the SDRC_POWER register here. |
438 | */ | 438 | */ |
439 | if (omap_rev() >= OMAP3430_REV_ES3_0 && | 439 | if (omap_rev() >= OMAP3430_REV_ES3_0 && |
diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S index 06e47326e17c..17dfe30db3a7 100644 --- a/arch/arm/mach-omap2/sleep34xx.S +++ b/arch/arm/mach-omap2/sleep34xx.S | |||
@@ -596,6 +596,7 @@ usettbr0: | |||
596 | * Internal functions | 596 | * Internal functions |
597 | */ | 597 | */ |
598 | 598 | ||
599 | /* This function implements the erratum ID i443 WA, applies to 34xx >= ES3.0 */ | ||
599 | .text | 600 | .text |
600 | ENTRY(es3_sdrc_fix) | 601 | ENTRY(es3_sdrc_fix) |
601 | ldr r4, sdrc_syscfg @ get config addr | 602 | ldr r4, sdrc_syscfg @ get config addr |
@@ -641,6 +642,16 @@ sdrc_manual_1: | |||
641 | ENTRY(es3_sdrc_fix_sz) | 642 | ENTRY(es3_sdrc_fix_sz) |
642 | .word . - es3_sdrc_fix | 643 | .word . - es3_sdrc_fix |
643 | 644 | ||
645 | /* | ||
646 | * This function implements the erratum ID i581 WA: | ||
647 | * SDRC state restore before accessing the SDRAM | ||
648 | * | ||
649 | * Only used at return from non-OFF mode. For OFF | ||
650 | * mode the ROM code configures the SDRC and | ||
651 | * the DPLL before calling the restore code directly | ||
652 | * from DDR. | ||
653 | */ | ||
654 | |||
644 | /* Make sure SDRC accesses are ok */ | 655 | /* Make sure SDRC accesses are ok */ |
645 | wait_sdrc_ok: | 656 | wait_sdrc_ok: |
646 | 657 | ||