summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYe Li <ye.li@nxp.com>2017-02-14 11:39:12 +0800
committerYe Li <ye.li@nxp.com>2017-02-14 12:07:37 +0800
commit8cc70b1ded5309dee522aa00b43bd702a209ba51 (patch)
tree4ca6241f5405a987f9becc650c25b54c6aaff680
parent079db9559c06c5e68ab8f6cd67ec4f5115dd2d59 (diff)
downloadu-boot-imx-8cc70b1ded5309dee522aa00b43bd702a209ba51.zip
u-boot-imx-8cc70b1ded5309dee522aa00b43bd702a209ba51.tar.gz
u-boot-imx-8cc70b1ded5309dee522aa00b43bd702a209ba51.tar.bz2
MLK-13924 mx7ulp: Fix APLL num and denom setting issue
For the current APLL setting, as we want the APLL PFD0 to meet DDR clock 320Mhz requirement. We set MULT to 20, NUM to 4 and DENOM to 2, to get final 22 multiplier. But according to the RM, the NUM should always be less than the DENOM. So our setting violates the rule. Actually the ROM has already set the MULT to 22 and leave NUM/DENOM in default value. The calculated APLL PFD0 clock is 318.9888Mhz, which also meet the DDR requirement. To fix the issue, we remove the PLL settings in DCD to use default value from ROM, and only set the PFD0 FRAC. Signed-off-by: Ye Li <ye.li@nxp.com>
-rw-r--r--board/freescale/mx7ulp_arm2/imximage.cfg6
-rw-r--r--board/freescale/mx7ulp_arm2/imximage_lpddr2.cfg6
-rw-r--r--board/freescale/mx7ulp_arm2/plugin.S19
-rw-r--r--board/freescale/mx7ulp_evk/imximage.cfg6
-rw-r--r--board/freescale/mx7ulp_evk/plugin.S19
5 files changed, 2 insertions, 54 deletions
diff --git a/board/freescale/mx7ulp_arm2/imximage.cfg b/board/freescale/mx7ulp_arm2/imximage.cfg
index eb369b4..06b0259 100644
--- a/board/freescale/mx7ulp_arm2/imximage.cfg
+++ b/board/freescale/mx7ulp_arm2/imximage.cfg
@@ -44,13 +44,7 @@ CSF CONFIG_CSF_SIZE
*/
DATA 4 0x403f00e0 0x00000000
DATA 4 0x403e0040 0x01000020
-DATA 4 0x403e0500 0x01000000
DATA 4 0x403e050c 0x80808080
-DATA 4 0x403e0508 0x00140000
-DATA 4 0x403E0510 0x00000004
-DATA 4 0x403E0514 0x00000002
-DATA 4 0x403e0500 0x00000001
-CHECK_BITS_SET 4 0x403e0500 0x01000000
DATA 4 0x403e050c 0x8080801E
CHECK_BITS_SET 4 0x403e050c 0x00000040
DATA 4 0x403E0030 0x00000001
diff --git a/board/freescale/mx7ulp_arm2/imximage_lpddr2.cfg b/board/freescale/mx7ulp_arm2/imximage_lpddr2.cfg
index 5031c12..e465b72 100644
--- a/board/freescale/mx7ulp_arm2/imximage_lpddr2.cfg
+++ b/board/freescale/mx7ulp_arm2/imximage_lpddr2.cfg
@@ -44,13 +44,7 @@ CSF CONFIG_CSF_SIZE
*/
DATA 4 0x403f00e0 0x00000000
DATA 4 0x403e0040 0x01000020
-DATA 4 0x403e0500 0x01000000
DATA 4 0x403e050c 0x80808080
-DATA 4 0x403e0508 0x00140000
-DATA 4 0x403E0510 0x00000004
-DATA 4 0x403E0514 0x00000002
-DATA 4 0x403e0500 0x00000001
-CHECK_BITS_SET 4 0x403e0500 0x01000000
DATA 4 0x403e050c 0x8080801E
CHECK_BITS_SET 4 0x403e050c 0x00000040
DATA 4 0x403E0030 0x00000001
diff --git a/board/freescale/mx7ulp_arm2/plugin.S b/board/freescale/mx7ulp_arm2/plugin.S
index 4532b67..f9a8a0b 100644
--- a/board/freescale/mx7ulp_arm2/plugin.S
+++ b/board/freescale/mx7ulp_arm2/plugin.S
@@ -15,26 +15,9 @@
ldr r2, =0x403e0000
ldr r3, =0x01000020
str r3, [r2, #0x40]
- ldr r3, =0x01000000
- str r3, [r2, #0x500]
+
ldr r3, =0x80808080
str r3, [r2, #0x50c]
- ldr r3, =0x00140000
- str r3, [r2, #0x508]
- ldr r3, =0x00000004
- str r3, [r2, #0x510]
- ldr r3, =0x00000002
- str r3, [r2, #0x514]
- ldr r3, =0x00000001
- str r3, [r2, #0x500]
-
- ldr r3, =0x01000000
-wait1:
- ldr r4, [r2, #0x500]
- and r4, r3
- cmp r4, r3
- bne wait1
-
ldr r3, =0x8080801E
str r3, [r2, #0x50c]
diff --git a/board/freescale/mx7ulp_evk/imximage.cfg b/board/freescale/mx7ulp_evk/imximage.cfg
index 090e4a1..c495069 100644
--- a/board/freescale/mx7ulp_evk/imximage.cfg
+++ b/board/freescale/mx7ulp_evk/imximage.cfg
@@ -44,13 +44,7 @@ CSF CONFIG_CSF_SIZE
*/
DATA 4 0x403f00dc 0x00000000
DATA 4 0x403e0040 0x01000020
-DATA 4 0x403e0500 0x01000000
DATA 4 0x403e050c 0x80808080
-DATA 4 0x403e0508 0x00140000
-DATA 4 0x403E0510 0x00000004
-DATA 4 0x403E0514 0x00000002
-DATA 4 0x403e0500 0x00000001
-CHECK_BITS_SET 4 0x403e0500 0x01000000
DATA 4 0x403e050c 0x8080801E
CHECK_BITS_SET 4 0x403e050c 0x00000040
DATA 4 0x403E0030 0x00000001
diff --git a/board/freescale/mx7ulp_evk/plugin.S b/board/freescale/mx7ulp_evk/plugin.S
index 9eab365..5d13362 100644
--- a/board/freescale/mx7ulp_evk/plugin.S
+++ b/board/freescale/mx7ulp_evk/plugin.S
@@ -14,26 +14,9 @@
ldr r2, =0x403e0000
ldr r3, =0x01000020
str r3, [r2, #0x40]
- ldr r3, =0x01000000
- str r3, [r2, #0x500]
+
ldr r3, =0x80808080
str r3, [r2, #0x50c]
- ldr r3, =0x00140000
- str r3, [r2, #0x508]
- ldr r3, =0x00000004
- str r3, [r2, #0x510]
- ldr r3, =0x00000002
- str r3, [r2, #0x514]
- ldr r3, =0x00000001
- str r3, [r2, #0x500]
-
- ldr r3, =0x01000000
-wait1:
- ldr r4, [r2, #0x500]
- and r4, r3
- cmp r4, r3
- bne wait1
-
ldr r3, =0x8080801E
str r3, [r2, #0x50c]