From 9ed2cd2b06cbabfbf949eddfcef7bcd556f3ec17 Mon Sep 17 00:00:00 2001 From: Anson Huang Date: Mon, 25 Apr 2016 10:35:37 +0800 Subject: [PATCH] MLK-12705 ARM: imx: add support for i.mx7d TO1.2 busfreq i.MX7D TO1.2 fix the CKE issue, need to follow TO1.0's precedure for DRAM frequency scaling. Signed-off-by: Anson Huang --- arch/arm/mach-imx/ddr3_freq_imx7d.S | 8 ++++---- arch/arm/mach-imx/lpddr3_freq_imx.S | 13 +++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-imx/ddr3_freq_imx7d.S b/arch/arm/mach-imx/ddr3_freq_imx7d.S index bc132d3fa837..0a599ed22e3d 100644 --- a/arch/arm/mach-imx/ddr3_freq_imx7d.S +++ b/arch/arm/mach-imx/ddr3_freq_imx7d.S @@ -176,8 +176,8 @@ ldr r7, [r9, #ANADIG_DIGPROG] and r7, r7, #0x11 - cmp r7, #0x10 - beq 20f + cmp r7, #0x11 + bne 20f ldr r7, =0x0 str r7, [r5, #DDRPHY_CA_WLDSKEW_CON0] @@ -311,8 +311,8 @@ ldr r7, [r9, #ANADIG_DIGPROG] and r7, r7, #0x11 - cmp r7, #0x10 - beq 22f + cmp r7, #0x11 + bne 22f ldr r7, =0x40404040 str r7, [r5, #DDRPHY_CA_WLDSKEW_CON0] diff --git a/arch/arm/mach-imx/lpddr3_freq_imx.S b/arch/arm/mach-imx/lpddr3_freq_imx.S index da85b7cee780..5d868bd53f6f 100644 --- a/arch/arm/mach-imx/lpddr3_freq_imx.S +++ b/arch/arm/mach-imx/lpddr3_freq_imx.S @@ -187,8 +187,8 @@ ldr r7, [r9, #ANADIG_DIGPROG] and r7, r7, #0x11 - cmp r7, #0x10 - beq 11f + cmp r7, #0x11 + bne 11f ldr r7, =0x0 str r7, [r5, #DDRPHY_CA_WLDSKEW_CON0] @@ -247,6 +247,11 @@ ands r8, r8, #0x4 beq 15f + ldr r7, [r9, #ANADIG_DIGPROG] + and r7, r7, #0x11 + cmp r7, #0x11 + bne 14f + ldr r7, =0x08080808 str r7, [r5, #DDRPHY_CA_DSKEW_CON0] str r7, [r5, #DDRPHY_CA_DSKEW_CON1] @@ -258,8 +263,8 @@ 15: ldr r7, [r9, #ANADIG_DIGPROG] and r7, r7, #0x11 - cmp r7, #0x10 - beq 13f + cmp r7, #0x11 + bne 13f ldr r7, =0x1c1c1c1c str r7, [r5, #DDRPHY_CA_DSKEW_CON0] -- 2.17.1