From 2cf367813db2dd7d825e29fc907489d8dd8bbbb8 Mon Sep 17 00:00:00 2001 From: Dave Gerlach Date: Thu, 30 Jan 2014 22:24:25 -0600 Subject: [PATCH] ARM: AM43xx: Write sdram_config to secure_emif_sdram_config The register secure_emif_sdram_config in control module is copied to the EMIF sdram_config register when it is coming out of DeepSleep0 in order to ensure that the EMIF comes up for the correct type of DDR. Without this, resume can hang from within the kernel. Signed-off-by: Dave Gerlach --- arch/arm/cpu/armv7/am33xx/emif4d5.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/cpu/armv7/am33xx/emif4d5.c b/arch/arm/cpu/armv7/am33xx/emif4d5.c index 48e7f5927e..58c2de078a 100644 --- a/arch/arm/cpu/armv7/am33xx/emif4d5.c +++ b/arch/arm/cpu/armv7/am33xx/emif4d5.c @@ -178,6 +178,7 @@ void do_sdram_init(const struct ctrl_ioregs *ioregs, clrbits_le32(&emif->emif_sdram_ref_ctrl, EMIF_REG_INITREF_DIS_MASK); writel(regs->sdram_config, &emif->emif_sdram_config); + writel(regs->sdram_config, &cstat->secure_emif_sdram_config); writel(regs->ref_ctrl, &emif->emif_sdram_ref_ctrl); if (sdram_type == EMIF_SDRAM_TYPE_LPDDR2) {