diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-23 10:49:47 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-23 10:49:47 -0700 |
| commit | fa54cda779ce6df60ab5cfcb2088567945c76906 (patch) | |
| tree | fc70bce7b3df1c19b8007979b4d60e9cade15e5c /arch/arm/mach-imx/suspend-imx6.S | |
| parent | 00b24d445495af5548b163fa6b525108ac713db7 (diff) | |
| parent | 7f7308198f98700be82d123569ea59229a75d3c3 (diff) | |
Merge tag 'imx-soc-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
The i.MX SoC updates for 4.4:
- Enable suspend and cpufreq support for i.MX6UL
- Add platform level ENET initialization support for i.MX7D
* tag 'imx-soc-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx: add cpufreq device for imx6ul
ARM: imx: add enet init for i.MX7D platform
ARM: imx7d: add imx7d iomux-gpr field define
ARM: imx: add suspend/resume support for i.mx6ul
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-imx/suspend-imx6.S')
| -rw-r--r-- | arch/arm/mach-imx/suspend-imx6.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/suspend-imx6.S b/arch/arm/mach-imx/suspend-imx6.S index b99987b023fa..76ee2ceec8d5 100644 --- a/arch/arm/mach-imx/suspend-imx6.S +++ b/arch/arm/mach-imx/suspend-imx6.S @@ -79,12 +79,15 @@ /* sync L2 cache to drain L2's buffers to DRAM. */ #ifdef CONFIG_CACHE_L2X0 ldr r11, [r0, #PM_INFO_MX6Q_L2_V_OFFSET] + teq r11, #0 + beq 6f mov r6, #0x0 str r6, [r11, #L2X0_CACHE_SYNC] 1: ldr r6, [r11, #L2X0_CACHE_SYNC] ands r6, r6, #0x1 bne 1b +6: #endif .endm |