summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorTony Lindgren2019-04-10 18:06:01 +0200
committerTony Lindgren2019-04-10 18:06:01 +0200
commit35667d812c38a219ea2dc6f23d33db50de57099e (patch)
treec88ae546ccc06596539ca4fdbb16ae08e688f398 /arch/arm/mach-omap2
parentsoc: ti: pm33xx: AM437X: Add rtc_only with ddr in self-refresh support (diff)
parentARM: OMAP2+: sleep43xx: Run EMIF HW leveling on resume path (diff)
downloadkernel-qcow2-linux-35667d812c38a219ea2dc6f23d33db50de57099e.tar.gz
kernel-qcow2-linux-35667d812c38a219ea2dc6f23d33db50de57099e.tar.xz
kernel-qcow2-linux-35667d812c38a219ea2dc6f23d33db50de57099e.zip
Merge branch 'omap-for-v5.2/am4-ddr3' into omap-for-v5.2/am4-pm-v2
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/sleep43xx.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/sleep43xx.S b/arch/arm/mach-omap2/sleep43xx.S
index 5b9343b58fc7..0c1031442571 100644
--- a/arch/arm/mach-omap2/sleep43xx.S
+++ b/arch/arm/mach-omap2/sleep43xx.S
@@ -368,6 +368,9 @@ wait_emif_enable1:
mov r1, #AM43XX_EMIF_POWEROFF_DISABLE
str r1, [r2, #0x0]
+ ldr r1, [r9, #EMIF_PM_RUN_HW_LEVELING]
+ blx r1
+
#ifdef CONFIG_CACHE_L2X0
ldr r2, l2_cache_base
ldr r0, [r2, #L2X0_CTRL]