rockchip/rk3399: sdram: also prepare the index1 configuration

To enable DDR Dynamic Voltage and Frequency Scaling (DVFS) we need to
train alternative configurations first, so do the training and store the
values.

BUG=None
BRANCH=None
TEST=Boot from kevin

Change-Id: I944a4b297a4ed6966893aa09553da88171307a42
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 94533ff3ba21bcb0ace00bedcf0cebb89a341be2
Original-Change-Id: I4a98bc0db5553d154fedb657e35b926a92aa80c7
Original-Signed-off-by: Lin Huang <hl@rock-chips.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/386596
Original-Commit-Ready: Douglas Anderson <dianders@chromium.org>
Original-Reviewed-by: Derek Basehore <dbasehore@chromium.org>
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/17104
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>

1 files changed, 41 insertions, 41 deletions

diff --git a/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-666.c b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-666.c
index 4b73cb0154..e1a517acd8 100644
--- a/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-666.c
+++ b/src/mainboard/google/gru/sdram_params/sdram-lpddr3-hynix-4GB-666.c
@@ -70,10 +70,10 @@ struct rk3399_sdram_params params = {
 			0x000208d6,	/* DENALI_CTL_06_DATA */
 			0x0000029b,	/* DENALI_CTL_07_DATA */
 			0x00001a0b,	/* DENALI_CTL_08_DATA */
-			0x00000028,	/* DENALI_CTL_09_DATA */
-			0x00013880,	/* DENALI_CTL_10_DATA */
-			0x00000190,	/* DENALI_CTL_11_DATA */
-			0x00000fa0,	/* DENALI_CTL_12_DATA */
+			0x00000043,	/* DENALI_CTL_09_DATA */
+			0x000208d6,	/* DENALI_CTL_10_DATA */
+			0x0000029b,	/* DENALI_CTL_11_DATA */
+			0x00001a0b,	/* DENALI_CTL_12_DATA */
 			0x00000043,	/* DENALI_CTL_13_DATA */
 			0x000208d6,	/* DENALI_CTL_14_DATA */
 			0x0000029b,	/* DENALI_CTL_15_DATA */
@@ -89,40 +89,40 @@ struct rk3399_sdram_params params = {
 			0x04000614,	/* DENALI_CTL_25_DATA */
 			0x2a070004,	/* DENALI_CTL_26_DATA */
 			0x220c051c,	/* DENALI_CTL_27_DATA */
-			0x111a0400,	/* DENALI_CTL_28_DATA */
-			0x00140804,	/* DENALI_CTL_29_DATA */
+			0x1c2a0700,	/* DENALI_CTL_28_DATA */
+			0x00220c05,	/* DENALI_CTL_29_DATA */
 			0x051c2a07,	/* DENALI_CTL_30_DATA */
 			0x0500220c,	/* DENALI_CTL_31_DATA */
 			0x00000a0a,	/* DENALI_CTL_32_DATA */
 			0x0500b64a,	/* DENALI_CTL_33_DATA */
-			0x0a0a040a,	/* DENALI_CTL_34_DATA */
-			0x03006d60,	/* DENALI_CTL_35_DATA */
-			0x0a0a0506,	/* DENALI_CTL_36_DATA */
+			0x0a0a050a,	/* DENALI_CTL_34_DATA */
+			0x0500b64a,	/* DENALI_CTL_35_DATA */
+			0x0a0a050a,	/* DENALI_CTL_36_DATA */
 			0x0500b64a,	/* DENALI_CTL_37_DATA */
 			0x0203000a,	/* DENALI_CTL_38_DATA */
-			0x080a0c00,	/* DENALI_CTL_39_DATA */
-			0x040a0c06,	/* DENALI_CTL_40_DATA */
+			0x0c0a0c00,	/* DENALI_CTL_39_DATA */
+			0x040a0c0a,	/* DENALI_CTL_40_DATA */
 			0x14000a0a,	/* DENALI_CTL_41_DATA */
 			0x02020a0a,	/* DENALI_CTL_42_DATA */
 			0x00010002,	/* DENALI_CTL_43_DATA */
-			0x03160e16,	/* DENALI_CTL_44_DATA */
-			0x000e090e,	/* DENALI_CTL_45_DATA */
+			0x03161616,	/* DENALI_CTL_44_DATA */
+			0x000e0e0e,	/* DENALI_CTL_45_DATA */
 			0x00000000,	/* DENALI_CTL_46_DATA */
 			0x03010000,	/* DENALI_CTL_47_DATA */
 			0x0a20008c,	/* DENALI_CTL_48_DATA */
-			0x06100054,	/* DENALI_CTL_49_DATA */
+			0x0a20008c,	/* DENALI_CTL_49_DATA */
 			0x0a20008c,	/* DENALI_CTL_50_DATA */
 			0x00000000,	/* DENALI_CTL_51_DATA */
-			0x00030005,	/* DENALI_CTL_52_DATA */
+			0x00050005,	/* DENALI_CTL_52_DATA */
 			0x00100005,	/* DENALI_CTL_53_DATA */
-			0x0010000a,	/* DENALI_CTL_54_DATA */
-			0x000c080c,	/* DENALI_CTL_55_DATA */
+			0x00100010,	/* DENALI_CTL_54_DATA */
+			0x000c0c0c,	/* DENALI_CTL_55_DATA */
 			0x00000000,	/* DENALI_CTL_56_DATA */
 			0x00000000,	/* DENALI_CTL_57_DATA */
 			0x00000000,	/* DENALI_CTL_58_DATA */
 			0x00930000,	/* DENALI_CTL_59_DATA */
-			0x00580093,	/* DENALI_CTL_60_DATA */
-			0x00930058,	/* DENALI_CTL_61_DATA */
+			0x00930093,	/* DENALI_CTL_60_DATA */
+			0x00930093,	/* DENALI_CTL_61_DATA */
 			0x00000093,	/* DENALI_CTL_62_DATA */
 			0x00000000,	/* DENALI_CTL_63_DATA */
 			0x00000000,	/* DENALI_CTL_64_DATA */
@@ -145,7 +145,7 @@ struct rk3399_sdram_params params = {
 			0x00040005,	/* DENALI_CTL_81_DATA */
 			0x28800000,	/* DENALI_CTL_82_DATA */
 			0x00001440,	/* DENALI_CTL_83_DATA */
-			0x0c201840,	/* DENALI_CTL_84_DATA */
+			0x14402880,	/* DENALI_CTL_84_DATA */
 			0x28800000,	/* DENALI_CTL_85_DATA */
 			0x00001440,	/* DENALI_CTL_86_DATA */
 			0x00000000,	/* DENALI_CTL_87_DATA */
@@ -186,9 +186,9 @@ struct rk3399_sdram_params params = {
 			0x00860000,	/* DENALI_CTL_122_DATA */
 			0x00a70043,	/* DENALI_CTL_123_DATA */
 			0x00a70000,	/* DENALI_CTL_124_DATA */
-			0x00280050,	/* DENALI_CTL_125_DATA */
-			0x00000064,	/* DENALI_CTL_126_DATA */
-			0x00860064,	/* DENALI_CTL_127_DATA */
+			0x00430086,	/* DENALI_CTL_125_DATA */
+			0x000000a7,	/* DENALI_CTL_126_DATA */
+			0x008600a7,	/* DENALI_CTL_127_DATA */
 			0x00a70043,	/* DENALI_CTL_128_DATA */
 			0x00a70000,	/* DENALI_CTL_129_DATA */
 			0x00000000,	/* DENALI_CTL_130_DATA */
@@ -196,12 +196,12 @@ struct rk3399_sdram_params params = {
 			0x00000000,	/* DENALI_CTL_132_DATA */
 			0x00030000,	/* DENALI_CTL_133_DATA */
 			0x00000018,	/* DENALI_CTL_134_DATA */
-			0x00080083,	/* DENALI_CTL_135_DATA */
+			0x00180003,	/* DENALI_CTL_135_DATA */
 			0x00030000,	/* DENALI_CTL_136_DATA */
 			0x00000018,	/* DENALI_CTL_137_DATA */
 			0x00010001,	/* DENALI_CTL_138_DATA */
 			0x06000001,	/* DENALI_CTL_139_DATA */
-			0x00000707,	/* DENALI_CTL_140_DATA */
+			0x00000706,	/* DENALI_CTL_140_DATA */
 			0x00000000,	/* DENALI_CTL_141_DATA */
 			0x00000000,	/* DENALI_CTL_142_DATA */
 			0x00000000,	/* DENALI_CTL_143_DATA */
@@ -210,12 +210,12 @@ struct rk3399_sdram_params params = {
 			0x00000000,	/* DENALI_CTL_146_DATA */
 			0x00030000,	/* DENALI_CTL_147_DATA */
 			0x00000018,	/* DENALI_CTL_148_DATA */
-			0x00080083,	/* DENALI_CTL_149_DATA */
+			0x00180003,	/* DENALI_CTL_149_DATA */
 			0x00030000,	/* DENALI_CTL_150_DATA */
 			0x00000018,	/* DENALI_CTL_151_DATA */
 			0x00010001,	/* DENALI_CTL_152_DATA */
 			0x06000001,	/* DENALI_CTL_153_DATA */
-			0x00000707,	/* DENALI_CTL_154_DATA */
+			0x00000706,	/* DENALI_CTL_154_DATA */
 			0x00000000,	/* DENALI_CTL_155_DATA */
 			0x00000000,	/* DENALI_CTL_156_DATA */
 			0x00000000,	/* DENALI_CTL_157_DATA */
@@ -243,13 +243,13 @@ struct rk3399_sdram_params params = {
 			0x00029b03,	/* DENALI_CTL_179_DATA */
 			0x003c00f0,	/* DENALI_CTL_180_DATA */
 			0x00000000,	/* DENALI_CTL_181_DATA */
-			0x00900190,	/* DENALI_CTL_182_DATA */
-			0x00000024,	/* DENALI_CTL_183_DATA */
+			0x00f0029b,	/* DENALI_CTL_182_DATA */
+			0x0000003c,	/* DENALI_CTL_183_DATA */
 			0x00029b00,	/* DENALI_CTL_184_DATA */
 			0x003c00f0,	/* DENALI_CTL_185_DATA */
 			0x00000000,	/* DENALI_CTL_186_DATA */
 			0x00220000,	/* DENALI_CTL_187_DATA */
-			0x00220014,	/* DENALI_CTL_188_DATA */
+			0x00220022,	/* DENALI_CTL_188_DATA */
 			0x01010100,	/* DENALI_CTL_189_DATA */
 			0x01000202,	/* DENALI_CTL_190_DATA */
 			0x0a000002,	/* DENALI_CTL_191_DATA */
@@ -273,17 +273,17 @@ struct rk3399_sdram_params params = {
 			0x00000000,	/* DENALI_CTL_209_DATA */
 			0x00000000,	/* DENALI_CTL_210_DATA */
 			0x00010000,	/* DENALI_CTL_211_DATA */
-			0x03020301,	/* DENALI_CTL_212_DATA */
+			0x03030301,	/* DENALI_CTL_212_DATA */
 			0x01010808,	/* DENALI_CTL_213_DATA */
-			0x04030001,	/* DENALI_CTL_214_DATA */
+			0x03030001,	/* DENALI_CTL_214_DATA */
 			0x08080803,	/* DENALI_CTL_215_DATA */
 			0x08080808,	/* DENALI_CTL_216_DATA */
-			0x02050203,	/* DENALI_CTL_217_DATA */
-			0x02050303,	/* DENALI_CTL_218_DATA */
+			0x08050203,	/* DENALI_CTL_217_DATA */
+			0x02050203,	/* DENALI_CTL_218_DATA */
 			0x00050203,	/* DENALI_CTL_219_DATA */
 			0x00020202,	/* DENALI_CTL_220_DATA */
-			0x03020400,	/* DENALI_CTL_221_DATA */
-			0x00020401,	/* DENALI_CTL_222_DATA */
+			0x04020400,	/* DENALI_CTL_221_DATA */
+			0x00020402,	/* DENALI_CTL_222_DATA */
 			0x00000000,	/* DENALI_CTL_223_DATA */
 			0x00000000,	/* DENALI_CTL_224_DATA */
 			0x0d000001,	/* DENALI_CTL_225_DATA */
@@ -336,7 +336,7 @@ struct rk3399_sdram_params params = {
 			0x00000000,	/* DENALI_CTL_272_DATA */
 			0x00000000,	/* DENALI_CTL_273_DATA */
 			0x00ffff00,	/* DENALI_CTL_274_DATA */
-			0x181b0000,	/* DENALI_CTL_275_DATA */
+			0x1b1b0000,	/* DENALI_CTL_275_DATA */
 			0x0800001b,	/* DENALI_CTL_276_DATA */
 			0x00001440,	/* DENALI_CTL_277_DATA */
 			0x00000200,	/* DENALI_CTL_278_DATA */
@@ -345,13 +345,13 @@ struct rk3399_sdram_params params = {
 			0x00000200,	/* DENALI_CTL_281_DATA */
 			0x00001440,	/* DENALI_CTL_282_DATA */
 			0x0000ca80,	/* DENALI_CTL_283_DATA */
-			0x0c200509,	/* DENALI_CTL_284_DATA */
+			0x14400509,	/* DENALI_CTL_284_DATA */
 			0x00000200,	/* DENALI_CTL_285_DATA */
 			0x00000200,	/* DENALI_CTL_286_DATA */
 			0x00000200,	/* DENALI_CTL_287_DATA */
 			0x00000200,	/* DENALI_CTL_288_DATA */
-			0x00000c20,	/* DENALI_CTL_289_DATA */
-			0x00007940,	/* DENALI_CTL_290_DATA */
+			0x00001440,	/* DENALI_CTL_289_DATA */
+			0x0000ca80,	/* DENALI_CTL_290_DATA */
 			0x14400509,	/* DENALI_CTL_291_DATA */
 			0x00000200,	/* DENALI_CTL_292_DATA */
 			0x00000200,	/* DENALI_CTL_293_DATA */
@@ -370,7 +370,7 @@ struct rk3399_sdram_params params = {
 			0x00000000,	/* DENALI_CTL_306_DATA */
 			0x00030000,	/* DENALI_CTL_307_DATA */
 			0x000d001f,	/* DENALI_CTL_308_DATA */
-			0x000a001c,	/* DENALI_CTL_309_DATA */
+			0x000d001f,	/* DENALI_CTL_309_DATA */
 			0x000d001f,	/* DENALI_CTL_310_DATA */
 			0x00000000,	/* DENALI_CTL_311_DATA */
 			0x00000000,	/* DENALI_CTL_312_DATA */