imx8mn: Update the DDR4 timing script on imx8mn ddr4 evk

On i.MX8MN, we can only support DLL-ON mode only, so update the timing
to support 2400mts & 1066mts setpoint.

Signed-off-by: Jacky Bai <ping.bai@nxp.com>
Reviewed-by: Ye Li <ye.li@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>

1 files changed, 449 insertions, 608 deletions

diff --git a/board/freescale/imx8mn_evk/ddr4_timing.c b/board/freescale/imx8mn_evk/ddr4_timing.c
index cfd193a..f1509e2 100644
--- a/board/freescale/imx8mn_evk/ddr4_timing.c
+++ b/board/freescale/imx8mn_evk/ddr4_timing.c
@@ -1,121 +1,73 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2019 NXP
  *
- * SPDX-License-Identifier:	GPL-2.0+
- *
  * Generated code from MX8M_DDR_tool
- * Align with uboot-imx_v2018.03_4.14.78_1.0.0_ga
+ * Align with uboot version:
+ * imx_v2018.03_4.14.78_1.0.0_ga ~ imx_v2018.04_4.19.35_1.0.0_ga
  */
 
 #include <linux/kernel.h>
 #include <asm/arch/ddr.h>
 
 struct dram_cfg_param ddr_ddrc_cfg[] = {
-	{0x3d400000, 0x81040010},
-	{0x3d400030, 0x00000020},
-	{0x3d400034, 0x00221306},
-	{0x3d400050, 0x00210070},
-	{0x3d400054, 0x00010008},
-	{0x3d400060, 0x00000000},
-	{0x3d400064, 0x0092014a},
-	{0x3d4000c0, 0x00000000},
-	{0x3d4000c4, 0x00001000},
-	{0x3d4000d0, 0xc0030126},
-	{0x3d4000d4, 0x00770000},
-	{0x3d4000dc, 0x08340105},
-	{0x3d4000e0, 0x00180200},
-	{0x3d4000e4, 0x00110000},
-	{0x3d4000e8, 0x02000740},
-	{0x3d4000ec, 0x00000850},
-	{0x3d4000f4, 0x00000ec7},
-	{0x3d400100, 0x11122914},
-	{0x3d400104, 0x0004051c},
-	{0x3d400108, 0x0608050d},
-	{0x3d40010c, 0x0000400c},
-	{0x3d400110, 0x08030409},
-	{0x3d400114, 0x06060403},
-	{0x3d40011c, 0x00000606},
-	{0x3d400120, 0x07070d0c},
-	{0x3d400124, 0x0002040a},
-	{0x3d40012c, 0x1809010e},
-	{0x3d400130, 0x00000008},
-	{0x3d40013c, 0x00000000},
-	{0x3d400180, 0x01000040},
-	{0x3d400184, 0x0000493e},
-	{0x3d400190, 0x038b8207},
-	{0x3d400194, 0x02020303},
-	{0x3d400198, 0x07f04011},
-	{0x3d40019c, 0x000000b0},
-	{0x3d4001a0, 0xe0400018},
-	{0x3d4001a4, 0x0048005a},
-	{0x3d4001a8, 0x80000000},
-	{0x3d4001b0, 0x00000001},
-	{0x3d4001b4, 0x00000b07},
-	{0x3d4001b8, 0x00000004},
-	{0x3d4001c0, 0x00000001},
-	{0x3d4001c4, 0x00000000},
-	{0x3d400240, 0x06000610},
-	{0x3d400244, 0x00001323},
-	{0x3d400200, 0x00003f1f},
-	{0x3d400204, 0x003f0909},
-	{0x3d400208, 0x01010100},
-	{0x3d40020c, 0x01010101},
-	{0x3d400210, 0x00001f1f},
-	{0x3d400214, 0x07070707},
-	{0x3d400218, 0x07070707},
-	{0x3d40021c, 0x00000f07},
-	{0x3d400220, 0x00003f01},
-	{0x3d402050, 0x00210070},
-	{0x3d402064, 0x00180037},
-	{0x3d4020dc, 0x00000105},
-	{0x3d4020e0, 0x00000000},
-	{0x3d4020e8, 0x02000740},
-	{0x3d4020ec, 0x00000050},
-	{0x3d402100, 0x08030604},
-	{0x3d402104, 0x00020205},
-	{0x3d402108, 0x05050309},
-	{0x3d40210c, 0x0000400c},
-	{0x3d402110, 0x02030202},
-	{0x3d402114, 0x03030202},
-	{0x3d402118, 0x0a070008},
-	{0x3d40211c, 0x00000d09},
-	{0x3d402120, 0x08084b09},
-	{0x3d402124, 0x00020308},
-	{0x3d402128, 0x000f0d06},
-	{0x3d40212c, 0x12060111},
-	{0x3d402130, 0x00000008},
-	{0x3d40213c, 0x00000000},
-	{0x3d402180, 0x01000040},
-	{0x3d402190, 0x03848204},
-	{0x3d402194, 0x02020303},
-	{0x3d4021b4, 0x00000404},
-	{0x3d4021b8, 0x00000004},
-	{0x3d402240, 0x07000600},
-	{0x3d403050, 0x00210070},
-	{0x3d403064, 0x0006000d},
-	{0x3d4030dc, 0x00000105},
-	{0x3d4030e0, 0x00000000},
-	{0x3d4030e8, 0x02000740},
-	{0x3d4030ec, 0x00000050},
-	{0x3d403100, 0x07010101},
-	{0x3d403104, 0x00020202},
-	{0x3d403108, 0x05050309},
-	{0x3d40310c, 0x0000400c},
-	{0x3d403110, 0x01030201},
-	{0x3d403114, 0x03030202},
-	{0x3d40311c, 0x00000303},
-	{0x3d403120, 0x02020d02},
-	{0x3d403124, 0x00020208},
-	{0x3d403128, 0x000f0d06},
-	{0x3d40312c, 0x0e02010e},
-	{0x3d403130, 0x00000008},
-	{0x3d40313c, 0x00000000},
-	{0x3d403180, 0x01000040},
-	{0x3d403190, 0x03848204},
-	{0x3d403194, 0x02020303},
-	{0x3d4031b4, 0x00000404},
-	{0x3d4031b8, 0x00000004},
-	{0x3d403240, 0x07000600},
+	/** Initialize DDRC registers **/
+	{ 0x3d400000, 0x81040010 },
+	{ 0x3d400030, 0x20 },
+	{ 0x3d400034, 0x221306 },
+	{ 0x3d400050, 0x210070 },
+	{ 0x3d400054, 0x10008 },
+	{ 0x3d400060, 0x0 },
+	{ 0x3d400064, 0x92014a },
+	{ 0x3d4000c0, 0x0 },
+	{ 0x3d4000c4, 0x1000 },
+	{ 0x3d4000d0, 0xc0030126 },
+	{ 0x3d4000d4, 0x770000 },
+	{ 0x3d4000dc, 0x8340105 },
+	{ 0x3d4000e0, 0x180200 },
+	{ 0x3d4000e4, 0x110000 },
+	{ 0x3d4000e8, 0x2000600 },
+	{ 0x3d4000ec, 0x810 },
+	{ 0x3d4000f0, 0x20 },
+	{ 0x3d4000f4, 0xec7 },
+	{ 0x3d400100, 0x11122914 },
+	{ 0x3d400104, 0x4051c },
+	{ 0x3d400108, 0x608050d },
+	{ 0x3d40010c, 0x400c },
+	{ 0x3d400110, 0x8030409 },
+	{ 0x3d400114, 0x6060403 },
+	{ 0x3d40011c, 0x606 },
+	{ 0x3d400120, 0x7070d0c },
+	{ 0x3d400124, 0x2040a },
+	{ 0x3d40012c, 0x1809010e },
+	{ 0x3d400130, 0x8 },
+	{ 0x3d40013c, 0x0 },
+	{ 0x3d400180, 0x1000040 },
+	{ 0x3d400184, 0x493e },
+	{ 0x3d400190, 0x38b8207 },
+	{ 0x3d400194, 0x2020303 },
+	{ 0x3d400198, 0x7f04011 },
+	{ 0x3d40019c, 0xb0 },
+	{ 0x3d4001a0, 0xe0400018 },
+	{ 0x3d4001a4, 0x48005a },
+	{ 0x3d4001a8, 0x80000000 },
+	{ 0x3d4001b0, 0x1 },
+	{ 0x3d4001b4, 0xb07 },
+	{ 0x3d4001b8, 0x4 },
+	{ 0x3d4001c0, 0x1 },
+	{ 0x3d4001c4, 0x0 },
+	{ 0x3d400200, 0x3f1f },
+	{ 0x3d400204, 0x3f0909 },
+	{ 0x3d400208, 0x700 },
+	{ 0x3d40020c, 0x0 },
+	{ 0x3d400210, 0x1f1f },
+	{ 0x3d400214, 0x7070707 },
+	{ 0x3d400218, 0x7070707 },
+	{ 0x3d40021c, 0xf07 },
+	{ 0x3d400220, 0x3f01 },
+	{ 0x3d400240, 0x6000610 },
+	{ 0x3d400244, 0x1323 },
+	{ 0x3d400400, 0x100 },
 
 	/* performance setting */
 	{ 0x3d400250, 0x00001f05 },
@@ -126,141 +78,136 @@ struct dram_cfg_param ddr_ddrc_cfg[] = {
 	{ 0x3d400498, 0x03ff0000 },
 	{ 0x3d40049c, 0x01000e00 },
 	{ 0x3d4004a0, 0x03ff0000 },
+
+	{ 0x3d402050, 0x210070 },
+	{ 0x3d402064, 0x400093 },
+	{ 0x3d4020dc, 0x105 },
+	{ 0x3d4020e0, 0x0 },
+	{ 0x3d4020e8, 0x2000600 },
+	{ 0x3d4020ec, 0x10 },
+	{ 0x3d402100, 0xb081209 },
+	{ 0x3d402104, 0x2020d },
+	{ 0x3d402108, 0x5050309 },
+	{ 0x3d40210c, 0x400c },
+	{ 0x3d402110, 0x5030206 },
+	{ 0x3d402114, 0x3030202 },
+	{ 0x3d40211c, 0x303 },
+	{ 0x3d402120, 0x4040d06 },
+	{ 0x3d402124, 0x20208 },
+	{ 0x3d40212c, 0x1205010e },
+	{ 0x3d402130, 0x8 },
+	{ 0x3d40213c, 0x0 },
+	{ 0x3d402180, 0x1000040 },
+	{ 0x3d402190, 0x3848204 },
+	{ 0x3d402194, 0x2020303 },
+	{ 0x3d4021b4, 0x404 },
+	{ 0x3d4021b8, 0x4 },
+	{ 0x3d402240, 0x6000600 },
+	{ 0x3d4020f4, 0xec7 },
 };
 
 /* PHY Initialize Configuration */
 struct dram_cfg_param ddr_ddrphy_cfg[] = {
-	{0x0001005f, 0x000002fd},
-	{0x0001015f, 0x000002fd},
-	{0x0001105f, 0x000002fd},
-	{0x0001115f, 0x000002fd},
-	{0x0011005f, 0x000002fd},
-	{0x0011015f, 0x000002fd},
-	{0x0011105f, 0x000002fd},
-	{0x0011115f, 0x000002fd},
-	{0x0021005f, 0x000002fd},
-	{0x0021015f, 0x000002fd},
-	{0x0021105f, 0x000002fd},
-	{0x0021115f, 0x000002fd},
-	{0x00000055, 0x00000355},
-	{0x00001055, 0x00000355},
-	{0x00002055, 0x00000355},
-	{0x00003055, 0x00000355},
-	{0x00004055, 0x00000055},
-	{0x00005055, 0x00000055},
-	{0x00006055, 0x00000355},
-	{0x00007055, 0x00000355},
-	{0x00008055, 0x00000355},
-	{0x00009055, 0x00000355},
-	{0x000200c5, 0x0000000a},
-	{0x001200c5, 0x00000007},
-	{0x002200c5, 0x00000007},
-	{0x0002002e, 0x00000002},
-	{0x0012002e, 0x00000002},
-	{0x0022002e, 0x00000002},
-	{0x00020024, 0x00000008},
-	{0x0002003a, 0x00000002},
-	{0x0002007d, 0x00000212},
-	{0x0002007c, 0x00000061},
-	{0x00120024, 0x00000008},
-	{0x0002003a, 0x00000002},
-	{0x0012007d, 0x00000212},
-	{0x0012007c, 0x00000061},
-	{0x00220024, 0x00000008},
-	{0x0002003a, 0x00000002},
-	{0x0022007d, 0x00000212},
-	{0x0022007c, 0x00000061},
-	{0x00020056, 0x00000006},
-	{0x00120056, 0x0000000a},
-	{0x00220056, 0x0000000a},
-	{0x0001004d, 0x0000001a},
-	{0x0001014d, 0x0000001a},
-	{0x0001104d, 0x0000001a},
-	{0x0001114d, 0x0000001a},
-	{0x0011004d, 0x0000001a},
-	{0x0011014d, 0x0000001a},
-	{0x0011104d, 0x0000001a},
-	{0x0011114d, 0x0000001a},
-	{0x0021004d, 0x0000001a},
-	{0x0021014d, 0x0000001a},
-	{0x0021104d, 0x0000001a},
-	{0x0021114d, 0x0000001a},
-	{0x00010049, 0x00000e38},
-	{0x00010149, 0x00000e38},
-	{0x00011049, 0x00000e38},
-	{0x00011149, 0x00000e38},
-	{0x00110049, 0x00000e38},
-	{0x00110149, 0x00000e38},
-	{0x00111049, 0x00000e38},
-	{0x00111149, 0x00000e38},
-	{0x00210049, 0x00000e38},
-	{0x00210149, 0x00000e38},
-	{0x00211049, 0x00000e38},
-	{0x00211149, 0x00000e38},
-	{0x00000043, 0x00000063},
-	{0x00001043, 0x00000063},
-	{0x00002043, 0x00000063},
-	{0x00003043, 0x00000063},
-	{0x00004043, 0x00000063},
-	{0x00005043, 0x00000063},
-	{0x00006043, 0x00000063},
-	{0x00007043, 0x00000063},
-	{0x00008043, 0x00000063},
-	{0x00009043, 0x00000063},
-	{0x00020018, 0x00000001},
-	{0x00020075, 0x00000002},
-	{0x00020050, 0x00000000},
-	{0x00020008, 0x00000258},
-	{0x00120008, 0x00000064},
-	{0x00220008, 0x00000019},
-	{0x00020088, 0x00000009},
-	{0x000200b2, 0x00000268},
-	{0x00010043, 0x000005b1},
-	{0x00010143, 0x000005b1},
-	{0x00011043, 0x000005b1},
-	{0x00011143, 0x000005b1},
-	{0x001200b2, 0x00000268},
-	{0x00110043, 0x000005b1},
-	{0x00110143, 0x000005b1},
-	{0x00111043, 0x000005b1},
-	{0x00111143, 0x000005b1},
-	{0x002200b2, 0x00000268},
-	{0x00210043, 0x000005b1},
-	{0x00210143, 0x000005b1},
-	{0x00211043, 0x000005b1},
-	{0x00211143, 0x000005b1},
-	{0x0002005b, 0x00007529},
-	{0x0002005c, 0x00000000},
-	{0x000200fa, 0x00000001},
-	{0x001200fa, 0x00000001},
-	{0x002200fa, 0x00000001},
-	{0x00020019, 0x00000005},
-	{0x00120019, 0x00000005},
-	{0x00220019, 0x00000005},
-	{0x000200f0, 0x00005665},
-	{0x000200f1, 0x00005555},
-	{0x000200f2, 0x00005555},
-	{0x000200f3, 0x00005555},
-	{0x000200f4, 0x00005555},
-	{0x000200f5, 0x00005555},
-	{0x000200f6, 0x00005555},
-	{0x000200f7, 0x0000f000},
-	{0x0001004a, 0x00000500},
-	{0x0001104a, 0x00000500},
-	{0x00020025, 0x00000000},
-	{0x0002002d, 0x00000000},
-	{0x0012002d, 0x00000000},
-	{0x0022002d, 0x00000000},
-	{0x0002002c, 0x00000000},
-	{0x000200c7, 0x00000021},
-	{0x000200ca, 0x00000024},
-	{0x000200cc, 0x000001f7},
-	{0x001200c7, 0x00000021},
-	{0x001200ca, 0x00000024},
-	{0x001200cc, 0x000001f7},
-	{0x002200c7, 0x00000021},
-	{0x002200ca, 0x00000024},
-	{0x002200cc, 0x000001f7},
+	{ 0x1005f, 0x2fd },
+	{ 0x1015f, 0x2fd },
+	{ 0x1105f, 0x2fd },
+	{ 0x1115f, 0x2fd },
+	{ 0x11005f, 0x2fd },
+	{ 0x11015f, 0x2fd },
+	{ 0x11105f, 0x2fd },
+	{ 0x11115f, 0x2fd },
+	{ 0x55, 0x355 },
+	{ 0x1055, 0x355 },
+	{ 0x2055, 0x355 },
+	{ 0x3055, 0x355 },
+	{ 0x4055, 0x55 },
+	{ 0x5055, 0x55 },
+	{ 0x6055, 0x355 },
+	{ 0x7055, 0x355 },
+	{ 0x8055, 0x355 },
+	{ 0x9055, 0x355 },
+	{ 0x200c5, 0xa },
+	{ 0x1200c5, 0x6 },
+	{ 0x2002e, 0x2 },
+	{ 0x12002e, 0x1 },
+	{ 0x20024, 0x8 },
+	{ 0x2003a, 0x2 },
+	{ 0x120024, 0x8 },
+	{ 0x2003a, 0x2 },
+	{ 0x20056, 0x6 },
+	{ 0x120056, 0xa },
+	{ 0x1004d, 0x1a },
+	{ 0x1014d, 0x1a },
+	{ 0x1104d, 0x1a },
+	{ 0x1114d, 0x1a },
+	{ 0x11004d, 0x1a },
+	{ 0x11014d, 0x1a },
+	{ 0x11104d, 0x1a },
+	{ 0x11114d, 0x1a },
+	{ 0x10049, 0xe38 },
+	{ 0x10149, 0xe38 },
+	{ 0x11049, 0xe38 },
+	{ 0x11149, 0xe38 },
+	{ 0x110049, 0xe38 },
+	{ 0x110149, 0xe38 },
+	{ 0x111049, 0xe38 },
+	{ 0x111149, 0xe38 },
+	{ 0x43, 0x63 },
+	{ 0x1043, 0x63 },
+	{ 0x2043, 0x63 },
+	{ 0x3043, 0x63 },
+	{ 0x4043, 0x63 },
+	{ 0x5043, 0x63 },
+	{ 0x6043, 0x63 },
+	{ 0x7043, 0x63 },
+	{ 0x8043, 0x63 },
+	{ 0x9043, 0x63 },
+	{ 0x20018, 0x1 },
+	{ 0x20075, 0x2 },
+	{ 0x20050, 0x0 },
+	{ 0x20008, 0x258 },
+	{ 0x120008, 0x10a },
+	{ 0x20088, 0x9 },
+	{ 0x200b2, 0x268 },
+	{ 0x10043, 0x5b1 },
+	{ 0x10143, 0x5b1 },
+	{ 0x11043, 0x5b1 },
+	{ 0x11143, 0x5b1 },
+	{ 0x1200b2, 0x268 },
+	{ 0x110043, 0x5b1 },
+	{ 0x110143, 0x5b1 },
+	{ 0x111043, 0x5b1 },
+	{ 0x111143, 0x5b1 },
+	{ 0x200fa, 0x1 },
+	{ 0x1200fa, 0x1 },
+	{ 0x20019, 0x5 },
+	{ 0x120019, 0x5 },
+	{ 0x200f0, 0x5555 },
+	{ 0x200f1, 0x5555 },
+	{ 0x200f2, 0x5555 },
+	{ 0x200f3, 0x5555 },
+	{ 0x200f4, 0x5555 },
+	{ 0x200f5, 0x5555 },
+	{ 0x200f6, 0x5555 },
+	{ 0x200f7, 0xf000 },
+	{ 0x20025, 0x0 },
+	{ 0x2002d, 0x0 },
+	{ 0x12002d, 0x0 },
+	{ 0x2005b, 0x7529 },
+	{ 0x2005c, 0x0 },
+	{ 0x200c7, 0x21 },
+	{ 0x200ca, 0x24 },
+	{ 0x200cc, 0x1f7 },
+	{ 0x1200c7, 0x21 },
+	{ 0x1200ca, 0x24 },
+	{ 0x1200cc, 0x1f7 },
+	{ 0x2007d, 0x212 },
+	{ 0x12007d, 0x212 },
+	{ 0x2007c, 0x61 },
+	{ 0x12007c, 0x61 },
+	{ 0x1004a, 0x500 },
+	{ 0x1104a, 0x500 },
+	{ 0x2002c, 0x0 },
 };
 
 /* ddr phy trained csr */
@@ -792,378 +739,279 @@ struct dram_cfg_param ddr_ddrphy_trained_csr[] = {
 
 /* P0 message block paremeter for training firmware */
 struct dram_cfg_param ddr_fsp0_cfg[] = {
-	{0x000d0000, 0x00000000},
-	{0x00020060, 0x00000002},
-	{0x00054000, 0x00000000},
-	{0x00054001, 0x00000000},
-	{0x00054002, 0x00000000},
-	{0x00054003, 0x00000960},
-	{0x00054004, 0x00000002},
-	{0x00054005, 0x00000000},
-	{0x00054006, 0x0000025e},
-	{0x00054007, 0x00001000},
-	{0x00054008, 0x00000101},
-	{0x00054009, 0x00000000},
-	{0x0005400a, 0x00000000},
-	{0x0005400b, 0x0000031f},
-	{0x0005400c, 0x000000c8},
-	{0x0005400d, 0x00000100},
-	{0x0005400e, 0x00000000},
-	{0x0005400f, 0x00000000},
-	{0x00054010, 0x00000000},
-	{0x00054011, 0x00000000},
-	{0x00054012, 0x00000001},
-	{0x0005402f, 0x00000834},
-	{0x00054030, 0x00000105},
-	{0x00054031, 0x00000018},
-	{0x00054032, 0x00000200},
-	{0x00054033, 0x00000200},
-	{0x00054034, 0x00000740},
-	{0x00054035, 0x00000850},
-	{0x00054036, 0x00000103},
-	{0x00054037, 0x00000000},
-	{0x00054038, 0x00000000},
-	{0x00054039, 0x00000000},
-	{0x0005403a, 0x00000000},
-	{0x0005403b, 0x00000000},
-	{0x0005403c, 0x00000000},
-	{0x0005403d, 0x00000000},
-	{0x0005403e, 0x00000000},
-	{0x0005403f, 0x00001221},
-	{0x000541fc, 0x00000100},
-	{0x000d0000, 0x00000001},
+	{ 0xd0000, 0x0 },
+	{ 0x54003, 0x960 },
+	{ 0x54004, 0x2 },
+	{ 0x54005, 0x2830 },
+	{ 0x54006, 0x25e },
+	{ 0x54007, 0x1000 },
+	{ 0x54008, 0x101 },
+	{ 0x5400b, 0x31f },
+	{ 0x5400c, 0xc8 },
+	{ 0x5400d, 0x100 },
+	{ 0x54012, 0x1 },
+	{ 0x5402f, 0x834 },
+	{ 0x54030, 0x105 },
+	{ 0x54031, 0x18 },
+	{ 0x54032, 0x200 },
+	{ 0x54033, 0x200 },
+	{ 0x54034, 0x600 },
+	{ 0x54035, 0x810 },
+	{ 0x54036, 0x101 },
+	{ 0x5403f, 0x1221 },
+	{ 0x541fc, 0x100 },
+	{ 0xd0000, 0x1 },
 };
 
 /* P1 message block paremeter for training firmware */
 struct dram_cfg_param ddr_fsp1_cfg[] = {
-	{0x000d0000, 0x00000000},
-	{0x00054000, 0x00000000},
-	{0x00054001, 0x00000000},
-	{0x00054002, 0x00000101},
-	{0x00054003, 0x00000190},
-	{0x00054004, 0x00000002},
-	{0x00054005, 0x00000000},
-	{0x00054006, 0x0000025e},
-	{0x00054007, 0x00001000},
-	{0x00054008, 0x00000101},
-	{0x00054009, 0x00000000},
-	{0x0005400a, 0x00000000},
-	{0x0005400b, 0x0000021f},
-	{0x0005400c, 0x000000c8},
-	{0x0005400d, 0x00000100},
-	{0x0005400e, 0x00000000},
-	{0x0005400f, 0x00000000},
-	{0x00054010, 0x00000000},
-	{0x00054011, 0x00000000},
-	{0x00054012, 0x00000001},
-	{0x0005402f, 0x00000000},
-	{0x00054030, 0x00000105},
-	{0x00054031, 0x00000000},
-	{0x00054032, 0x00000000},
-	{0x00054033, 0x00000200},
-	{0x00054034, 0x00000740},
-	{0x00054035, 0x00000050},
-	{0x00054036, 0x00000103},
-	{0x00054037, 0x00000000},
-	{0x00054038, 0x00000000},
-	{0x00054039, 0x00000000},
-	{0x0005403a, 0x00000000},
-	{0x0005403b, 0x00000000},
-	{0x0005403c, 0x00000000},
-	{0x0005403d, 0x00000000},
-	{0x0005403e, 0x00000000},
-	{0x0005403f, 0x00001221},
-	{0x000541fc, 0x00000100},
-	{0x000d0000, 0x00000001},
+	{ 0xd0000, 0x0 },
+	{ 0x54002, 0x1 },
+	{ 0x54003, 0x42a },
+	{ 0x54004, 0x2 },
+	{ 0x54005, 0x2830 },
+	{ 0x54006, 0x25e },
+	{ 0x54007, 0x1000 },
+	{ 0x54008, 0x101 },
+	{ 0x5400b, 0x21f },
+	{ 0x5400c, 0xc8 },
+	{ 0x5400d, 0x100 },
+	{ 0x54012, 0x1 },
+	{ 0x54030, 0x105 },
+	{ 0x54033, 0x200 },
+	{ 0x54034, 0x600 },
+	{ 0x54035, 0x10 },
+	{ 0x54036, 0x101 },
+	{ 0x5403f, 0x1221 },
+	{ 0x541fc, 0x100 },
+	{ 0xd0000, 0x1 },
 };
 
-/* P2 message block paremeter for training firmware */
-struct dram_cfg_param ddr_fsp2_cfg[] = {
-	{0x000d0000, 0x00000000},
-	{0x00054000, 0x00000000},
-	{0x00054001, 0x00000000},
-	{0x00054002, 0x00000102},
-	{0x00054003, 0x00000064},
-	{0x00054004, 0x00000002},
-	{0x00054005, 0x00000000},
-	{0x00054006, 0x0000025e},
-	{0x00054007, 0x00001000},
-	{0x00054008, 0x00000101},
-	{0x00054009, 0x00000000},
-	{0x0005400a, 0x00000000},
-	{0x0005400b, 0x0000021f},
-	{0x0005400c, 0x000000c8},
-	{0x0005400d, 0x00000100},
-	{0x0005400e, 0x00000000},
-	{0x0005400f, 0x00000000},
-	{0x00054010, 0x00000000},
-	{0x00054011, 0x00000000},
-	{0x00054012, 0x00000001},
-	{0x0005402f, 0x00000000},
-	{0x00054030, 0x00000105},
-	{0x00054031, 0x00000000},
-	{0x00054032, 0x00000000},
-	{0x00054033, 0x00000200},
-	{0x00054034, 0x00000740},
-	{0x00054035, 0x00000050},
-	{0x00054036, 0x00000103},
-	{0x00054037, 0x00000000},
-	{0x00054038, 0x00000000},
-	{0x00054039, 0x00000000},
-	{0x0005403a, 0x00000000},
-	{0x0005403b, 0x00000000},
-	{0x0005403c, 0x00000000},
-	{0x0005403d, 0x00000000},
-	{0x0005403e, 0x00000000},
-	{0x0005403f, 0x00001221},
-	{0x000541fc, 0x00000100},
-	{0x000d0000, 0x00000001},
-};
 
 /* P0 2D message block paremeter for training firmware */
 struct dram_cfg_param ddr_fsp0_2d_cfg[] = {
-	{0x000d0000, 0x00000000},
-	{0x00054000, 0x00000000},
-	{0x00054001, 0x00000000},
-	{0x00054002, 0x00000000},
-	{0x00054003, 0x00000960},
-	{0x00054004, 0x00000002},
-	{0x00054005, 0x00000000},
-	{0x00054006, 0x0000025e},
-	{0x00054007, 0x00001000},
-	{0x00054008, 0x00000101},
-	{0x00054009, 0x00000000},
-	{0x0005400a, 0x00000000},
-	{0x0005400b, 0x00000061},
-	{0x0005400c, 0x000000c8},
-	{0x0005400d, 0x00000100},
-	{0x0005400e, 0x00001f7f},
-	{0x0005400f, 0x00000000},
-	{0x00054010, 0x00000000},
-	{0x00054011, 0x00000000},
-	{0x00054012, 0x00000001},
-	{0x0005402f, 0x00000834},
-	{0x00054030, 0x00000105},
-	{0x00054031, 0x00000018},
-	{0x00054032, 0x00000200},
-	{0x00054033, 0x00000200},
-	{0x00054034, 0x00000740},
-	{0x00054035, 0x00000850},
-	{0x00054036, 0x00000103},
-	{0x00054037, 0x00000000},
-	{0x00054038, 0x00000000},
-	{0x00054039, 0x00000000},
-	{0x0005403a, 0x00000000},
-	{0x0005403b, 0x00000000},
-	{0x0005403c, 0x00000000},
-	{0x0005403d, 0x00000000},
-	{0x0005403e, 0x00000000},
-	{0x0005403f, 0x00001221},
-	{0x000541fc, 0x00000100},
-	{0x000d0000, 0x00000001},
+	{ 0xd0000, 0x0 },
+	{ 0x54003, 0x960 },
+	{ 0x54004, 0x2 },
+	{ 0x54005, 0x2830 },
+	{ 0x54006, 0x25e },
+	{ 0x54007, 0x1000 },
+	{ 0x54008, 0x101 },
+	{ 0x5400b, 0x61 },
+	{ 0x5400c, 0xc8 },
+	{ 0x5400d, 0x100 },
+	{ 0x5400e, 0x1f7f },
+	{ 0x54012, 0x1 },
+	{ 0x5402f, 0x834 },
+	{ 0x54030, 0x105 },
+	{ 0x54031, 0x18 },
+	{ 0x54032, 0x200 },
+	{ 0x54033, 0x200 },
+	{ 0x54034, 0x600 },
+	{ 0x54035, 0x810 },
+	{ 0x54036, 0x101 },
+	{ 0x5403f, 0x1221 },
+	{ 0x541fc, 0x100 },
+	{ 0xd0000, 0x1 },
 };
 
 /* DRAM PHY init engine image */
 struct dram_cfg_param ddr_phy_pie[] = {
-	{0xd0000, 0x0},
-	{0x90000, 0x10},
-	{0x90001, 0x400},
-	{0x90002, 0x10e},
-	{0x90003, 0x0},
-	{0x90004, 0x0},
-	{0x90005, 0x8},
-	{0x90029, 0xb},
-	{0x9002a, 0x480},
-	{0x9002b, 0x109},
-	{0x9002c, 0x8},
-	{0x9002d, 0x448},
-	{0x9002e, 0x139},
-	{0x9002f, 0x8},
-	{0x90030, 0x478},
-	{0x90031, 0x109},
-	{0x90032, 0x2},
-	{0x90033, 0x10},
-	{0x90034, 0x139},
-	{0x90035, 0xb},
-	{0x90036, 0x7c0},
-	{0x90037, 0x139},
-	{0x90038, 0x44},
-	{0x90039, 0x633},
-	{0x9003a, 0x159},
-	{0x9003b, 0x14f},
-	{0x9003c, 0x630},
-	{0x9003d, 0x159},
-	{0x9003e, 0x47},
-	{0x9003f, 0x633},
-	{0x90040, 0x149},
-	{0x90041, 0x4f},
-	{0x90042, 0x633},
-	{0x90043, 0x179},
-	{0x90044, 0x8},
-	{0x90045, 0xe0},
-	{0x90046, 0x109},
-	{0x90047, 0x0},
-	{0x90048, 0x7c8},
-	{0x90049, 0x109},
-	{0x9004a, 0x0},
-	{0x9004b, 0x1},
-	{0x9004c, 0x8},
-	{0x9004d, 0x0},
-	{0x9004e, 0x45a},
-	{0x9004f, 0x9},
-	{0x90050, 0x0},
-	{0x90051, 0x448},
-	{0x90052, 0x109},
-	{0x90053, 0x40},
-	{0x90054, 0x633},
-	{0x90055, 0x179},
-	{0x90056, 0x1},
-	{0x90057, 0x618},
-	{0x90058, 0x109},
-	{0x90059, 0x40c0},
-	{0x9005a, 0x633},
-	{0x9005b, 0x149},
-	{0x9005c, 0x8},
-	{0x9005d, 0x4},
-	{0x9005e, 0x48},
-	{0x9005f, 0x4040},
-	{0x90060, 0x633},
-	{0x90061, 0x149},
-	{0x90062, 0x0},
-	{0x90063, 0x4},
-	{0x90064, 0x48},
-	{0x90065, 0x40},
-	{0x90066, 0x633},
-	{0x90067, 0x149},
-	{0x90068, 0x10},
-	{0x90069, 0x4},
-	{0x9006a, 0x18},
-	{0x9006b, 0x0},
-	{0x9006c, 0x4},
-	{0x9006d, 0x78},
-	{0x9006e, 0x549},
-	{0x9006f, 0x633},
-	{0x90070, 0x159},
-	{0x90071, 0xd49},
-	{0x90072, 0x633},
-	{0x90073, 0x159},
-	{0x90074, 0x94a},
-	{0x90075, 0x633},
-	{0x90076, 0x159},
-	{0x90077, 0x441},
-	{0x90078, 0x633},
-	{0x90079, 0x149},
-	{0x9007a, 0x42},
-	{0x9007b, 0x633},
-	{0x9007c, 0x149},
-	{0x9007d, 0x1},
-	{0x9007e, 0x633},
-	{0x9007f, 0x149},
-	{0x90080, 0x0},
-	{0x90081, 0xe0},
-	{0x90082, 0x109},
-	{0x90083, 0xa},
-	{0x90084, 0x10},
-	{0x90085, 0x109},
-	{0x90086, 0x9},
-	{0x90087, 0x3c0},
-	{0x90088, 0x149},
-	{0x90089, 0x9},
-	{0x9008a, 0x3c0},
-	{0x9008b, 0x159},
-	{0x9008c, 0x18},
-	{0x9008d, 0x10},
-	{0x9008e, 0x109},
-	{0x9008f, 0x0},
-	{0x90090, 0x3c0},
-	{0x90091, 0x109},
-	{0x90092, 0x18},
-	{0x90093, 0x4},
-	{0x90094, 0x48},
-	{0x90095, 0x18},
-	{0x90096, 0x4},
-	{0x90097, 0x58},
-	{0x90098, 0xb},
-	{0x90099, 0x10},
-	{0x9009a, 0x109},
-	{0x9009b, 0x1},
-	{0x9009c, 0x10},
-	{0x9009d, 0x109},
-	{0x9009e, 0x5},
-	{0x9009f, 0x7c0},
-	{0x900a0, 0x109},
-	{0x900a1, 0x0},
-	{0x900a2, 0x8140},
-	{0x900a3, 0x10c},
-	{0x900a4, 0x10},
-	{0x900a5, 0x8138},
-	{0x900a6, 0x10c},
-	{0x900a7, 0x8},
-	{0x900a8, 0x7c8},
-	{0x900a9, 0x101},
-	{0x900aa, 0x8},
-	{0x900ab, 0x448},
-	{0x900ac, 0x109},
-	{0x900ad, 0xf},
-	{0x900ae, 0x7c0},
-	{0x900af, 0x109},
-	{0x900b0, 0x47},
-	{0x900b1, 0x630},
-	{0x900b2, 0x109},
-	{0x900b3, 0x8},
-	{0x900b4, 0x618},
-	{0x900b5, 0x109},
-	{0x900b6, 0x8},
-	{0x900b7, 0xe0},
-	{0x900b8, 0x109},
-	{0x900b9, 0x0},
-	{0x900ba, 0x7c8},
-	{0x900bb, 0x109},
-	{0x900bc, 0x8},
-	{0x900bd, 0x8140},
-	{0x900be, 0x10c},
-	{0x900bf, 0x0},
-	{0x900c0, 0x1},
-	{0x900c1, 0x8},
-	{0x900c2, 0x8},
-	{0x900c3, 0x4},
-	{0x900c4, 0x8},
-	{0x900c5, 0x8},
-	{0x900c6, 0x7c8},
-	{0x900c7, 0x101},
-	{0x90006, 0x0},
-	{0x90007, 0x0},
-	{0x90008, 0x8},
-	{0x90009, 0x0},
-	{0x9000a, 0x0},
-	{0x9000b, 0x0},
-	{0xd00e7, 0x400},
-	{0x90017, 0x0},
-	{0x90026, 0x2b},
-	{0x2000b, 0x4b},
-	{0x2000c, 0x96},
-	{0x2000d, 0x5dc},
-	{0x2000e, 0x2c},
-	{0x12000b, 0xc},
-	{0x12000c, 0x16},
-	{0x12000d, 0xfa},
-	{0x12000e, 0x10},
-	{0x22000b, 0x3},
-	{0x22000c, 0x3},
-	{0x22000d, 0x3e},
-	{0x22000e, 0x10},
-	{0x9000c, 0x0},
-	{0x9000d, 0x173},
-	{0x9000e, 0x60},
-	{0x9000f, 0x6110},
-	{0x90010, 0x2152},
-	{0x90011, 0xdfbd},
-	{0x90012, 0xffff},
-	{0x90013, 0x6152},
-	{0x20089, 0x1},
-	{0x20088, 0x19},
-	{0xc0080, 0x0},
-	{0xd0000, 0x1},
+	{ 0xd0000, 0x0 },
+	{ 0x90000, 0x10 },
+	{ 0x90001, 0x400 },
+	{ 0x90002, 0x10e },
+	{ 0x90003, 0x0 },
+	{ 0x90004, 0x0 },
+	{ 0x90005, 0x8 },
+	{ 0x90029, 0xb },
+	{ 0x9002a, 0x480 },
+	{ 0x9002b, 0x109 },
+	{ 0x9002c, 0x8 },
+	{ 0x9002d, 0x448 },
+	{ 0x9002e, 0x139 },
+	{ 0x9002f, 0x8 },
+	{ 0x90030, 0x478 },
+	{ 0x90031, 0x109 },
+	{ 0x90032, 0x2 },
+	{ 0x90033, 0x10 },
+	{ 0x90034, 0x139 },
+	{ 0x90035, 0xb },
+	{ 0x90036, 0x7c0 },
+	{ 0x90037, 0x139 },
+	{ 0x90038, 0x44 },
+	{ 0x90039, 0x633 },
+	{ 0x9003a, 0x159 },
+	{ 0x9003b, 0x14f },
+	{ 0x9003c, 0x630 },
+	{ 0x9003d, 0x159 },
+	{ 0x9003e, 0x47 },
+	{ 0x9003f, 0x633 },
+	{ 0x90040, 0x149 },
+	{ 0x90041, 0x4f },
+	{ 0x90042, 0x633 },
+	{ 0x90043, 0x179 },
+	{ 0x90044, 0x8 },
+	{ 0x90045, 0xe0 },
+	{ 0x90046, 0x109 },
+	{ 0x90047, 0x0 },
+	{ 0x90048, 0x7c8 },
+	{ 0x90049, 0x109 },
+	{ 0x9004a, 0x0 },
+	{ 0x9004b, 0x1 },
+	{ 0x9004c, 0x8 },
+	{ 0x9004d, 0x0 },
+	{ 0x9004e, 0x45a },
+	{ 0x9004f, 0x9 },
+	{ 0x90050, 0x0 },
+	{ 0x90051, 0x448 },
+	{ 0x90052, 0x109 },
+	{ 0x90053, 0x40 },
+	{ 0x90054, 0x633 },
+	{ 0x90055, 0x179 },
+	{ 0x90056, 0x1 },
+	{ 0x90057, 0x618 },
+	{ 0x90058, 0x109 },
+	{ 0x90059, 0x40c0 },
+	{ 0x9005a, 0x633 },
+	{ 0x9005b, 0x149 },
+	{ 0x9005c, 0x8 },
+	{ 0x9005d, 0x4 },
+	{ 0x9005e, 0x48 },
+	{ 0x9005f, 0x4040 },
+	{ 0x90060, 0x633 },
+	{ 0x90061, 0x149 },
+	{ 0x90062, 0x0 },
+	{ 0x90063, 0x4 },
+	{ 0x90064, 0x48 },
+	{ 0x90065, 0x40 },
+	{ 0x90066, 0x633 },
+	{ 0x90067, 0x149 },
+	{ 0x90068, 0x10 },
+	{ 0x90069, 0x4 },
+	{ 0x9006a, 0x18 },
+	{ 0x9006b, 0x0 },
+	{ 0x9006c, 0x4 },
+	{ 0x9006d, 0x78 },
+	{ 0x9006e, 0x549 },
+	{ 0x9006f, 0x633 },
+	{ 0x90070, 0x159 },
+	{ 0x90071, 0xd49 },
+	{ 0x90072, 0x633 },
+	{ 0x90073, 0x159 },
+	{ 0x90074, 0x94a },
+	{ 0x90075, 0x633 },
+	{ 0x90076, 0x159 },
+	{ 0x90077, 0x441 },
+	{ 0x90078, 0x633 },
+	{ 0x90079, 0x149 },
+	{ 0x9007a, 0x42 },
+	{ 0x9007b, 0x633 },
+	{ 0x9007c, 0x149 },
+	{ 0x9007d, 0x1 },
+	{ 0x9007e, 0x633 },
+	{ 0x9007f, 0x149 },
+	{ 0x90080, 0x0 },
+	{ 0x90081, 0xe0 },
+	{ 0x90082, 0x109 },
+	{ 0x90083, 0xa },
+	{ 0x90084, 0x10 },
+	{ 0x90085, 0x109 },
+	{ 0x90086, 0x9 },
+	{ 0x90087, 0x3c0 },
+	{ 0x90088, 0x149 },
+	{ 0x90089, 0x9 },
+	{ 0x9008a, 0x3c0 },
+	{ 0x9008b, 0x159 },
+	{ 0x9008c, 0x18 },
+	{ 0x9008d, 0x10 },
+	{ 0x9008e, 0x109 },
+	{ 0x9008f, 0x0 },
+	{ 0x90090, 0x3c0 },
+	{ 0x90091, 0x109 },
+	{ 0x90092, 0x18 },
+	{ 0x90093, 0x4 },
+	{ 0x90094, 0x48 },
+	{ 0x90095, 0x18 },
+	{ 0x90096, 0x4 },
+	{ 0x90097, 0x58 },
+	{ 0x90098, 0xb },
+	{ 0x90099, 0x10 },
+	{ 0x9009a, 0x109 },
+	{ 0x9009b, 0x1 },
+	{ 0x9009c, 0x10 },
+	{ 0x9009d, 0x109 },
+	{ 0x9009e, 0x5 },
+	{ 0x9009f, 0x7c0 },
+	{ 0x900a0, 0x109 },
+	{ 0x900a1, 0x0 },
+	{ 0x900a2, 0x8140 },
+	{ 0x900a3, 0x10c },
+	{ 0x900a4, 0x10 },
+	{ 0x900a5, 0x8138 },
+	{ 0x900a6, 0x10c },
+	{ 0x900a7, 0x8 },
+	{ 0x900a8, 0x7c8 },
+	{ 0x900a9, 0x101 },
+	{ 0x900aa, 0x8 },
+	{ 0x900ab, 0x448 },
+	{ 0x900ac, 0x109 },
+	{ 0x900ad, 0xf },
+	{ 0x900ae, 0x7c0 },
+	{ 0x900af, 0x109 },
+	{ 0x900b0, 0x47 },
+	{ 0x900b1, 0x630 },
+	{ 0x900b2, 0x109 },
+	{ 0x900b3, 0x8 },
+	{ 0x900b4, 0x618 },
+	{ 0x900b5, 0x109 },
+	{ 0x900b6, 0x8 },
+	{ 0x900b7, 0xe0 },
+	{ 0x900b8, 0x109 },
+	{ 0x900b9, 0x0 },
+	{ 0x900ba, 0x7c8 },
+	{ 0x900bb, 0x109 },
+	{ 0x900bc, 0x8 },
+	{ 0x900bd, 0x8140 },
+	{ 0x900be, 0x10c },
+	{ 0x900bf, 0x0 },
+	{ 0x900c0, 0x1 },
+	{ 0x900c1, 0x8 },
+	{ 0x900c2, 0x8 },
+	{ 0x900c3, 0x4 },
+	{ 0x900c4, 0x8 },
+	{ 0x900c5, 0x8 },
+	{ 0x900c6, 0x7c8 },
+	{ 0x900c7, 0x101 },
+	{ 0x90006, 0x0 },
+	{ 0x90007, 0x0 },
+	{ 0x90008, 0x8 },
+	{ 0x90009, 0x0 },
+	{ 0x9000a, 0x0 },
+	{ 0x9000b, 0x0 },
+	{ 0xd00e7, 0x400 },
+	{ 0x90017, 0x0 },
+	{ 0x90026, 0x2b },
+	{ 0x2000b, 0x4b },
+	{ 0x2000c, 0x96 },
+	{ 0x2000d, 0x5dc },
+	{ 0x2000e, 0x2c },
+	{ 0x12000b, 0x21 },
+	{ 0x12000c, 0x42 },
+	{ 0x12000d, 0x29a },
+	{ 0x12000e, 0x21 },
+	{ 0x9000c, 0x0 },
+	{ 0x9000d, 0x173 },
+	{ 0x9000e, 0x60 },
+	{ 0x9000f, 0x6110 },
+	{ 0x90010, 0x2152 },
+	{ 0x90011, 0xdfbd },
+	{ 0x90012, 0xffff },
+	{ 0x90013, 0x6152 },
+	{ 0x20089, 0x1 },
+	{ 0x20088, 0x19 },
+	{ 0xc0080, 0x0 },
+	{ 0xd0000, 0x1 }
 };
 
 struct dram_fsp_msg ddr_dram_fsp_msg[] = {
@@ -1175,20 +1023,13 @@ struct dram_fsp_msg ddr_dram_fsp_msg[] = {
 		.fsp_cfg_num = ARRAY_SIZE(ddr_fsp0_cfg),
 	},
 	{
-		/* P1 400mts 1D */
-		.drate = 400,
+		/* P1 1066mts 1D */
+		.drate = 1066,
 		.fw_type = FW_1D_IMAGE,
 		.fsp_cfg = ddr_fsp1_cfg,
 		.fsp_cfg_num = ARRAY_SIZE(ddr_fsp1_cfg),
 	},
 	{
-		/* P2 100mts 1D */
-		.drate = 100,
-		.fw_type = FW_1D_IMAGE,
-		.fsp_cfg = ddr_fsp2_cfg,
-		.fsp_cfg_num = ARRAY_SIZE(ddr_fsp2_cfg),
-	},
-	{
 		/* P0 2400mts 2D */
 		.drate = 2400,
 		.fw_type = FW_2D_IMAGE,
@@ -1209,6 +1050,6 @@ struct dram_timing_info dram_timing = {
 	.ddrphy_trained_csr_num = ARRAY_SIZE(ddr_ddrphy_trained_csr),
 	.ddrphy_pie = ddr_phy_pie,
 	.ddrphy_pie_num = ARRAY_SIZE(ddr_phy_pie),
-	.fsp_table = { 2400, 400, 100,},
+	.fsp_table = { 2400, 1066, },
 };