soc/intel/tgl and tgl mb/google,intel: Use the newly added meminit block driver

This change uses the newly added meminit block driver and updates TGL
SoC and mainboard code accordingly.

TEST=Verified that UPDs are configured correctly with and without this
change.

Change-Id: I6d58cd6568b7bbe03c4e3011b2301209893e85a9
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/49042
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>

1 files changed, 39 insertions, 42 deletions

diff --git a/src/mainboard/google/volteer/variants/voxel/memory.c b/src/mainboard/google/volteer/variants/voxel/memory.c
index 40b108660d..fe2b2b1999 100644
--- a/src/mainboard/google/volteer/variants/voxel/memory.c
+++ b/src/mainboard/google/volteer/variants/voxel/memory.c
@@ -2,64 +2,61 @@
 
 #include <baseboard/variants.h>
 
-static const struct lpddr4x_cfg voxel_memcfg = {
+static const struct mb_cfg board_memcfg = {
+	.type = MEM_TYPE_LP4X,
+
 	/* DQ byte map */
-	.dq_map = {
-		[0] = {
-			{ 3,  0,  1,  2,  6,  7,  5,  4, }, /* DDR0_DQ0[7:0] */
-			{ 12, 15, 14,  13, 8,  9, 10, 11 }, /* DDR0_DQ1[7:0] */
+	.lp4x_dq_map = {
+		.ddr0 = {
+			.dq0 = { 3,  0,  1,  2,  6,  7,  5,  4, }, /* DDR0_DQ0[7:0] */
+			.dq1 = { 12, 15, 14,  13, 8,  9, 10, 11 }, /* DDR0_DQ1[7:0] */
 		},
-		[1] = {
-			{ 12,  15,  13,  14,  10,  8,  11,  9, }, /* DDR1_DQ0[7:0] */
-			{ 5, 6, 7, 4,  0, 3, 1, 2  }, /* DDR1_DQ1[7:0] */
+		.ddr1 = {
+			.dq0 = { 12,  15,  13,  14,  10,  8,  11,  9, }, /* DDR1_DQ0[7:0] */
+			.dq1 = { 5, 6, 7, 4,  0, 3, 1, 2  }, /* DDR1_DQ1[7:0] */
 		},
-		[2] = {
-			{ 2, 3, 0, 1,  7, 6, 5, 4, }, /* DDR2_DQ0[7:0] */
-			{ 12,  14,  15,  13,  10,  9,  8,  11  }, /* DDR2_DQ1[7:0] */
+		.ddr2 = {
+			.dq0 = { 2, 3, 0, 1,  7, 6, 5, 4, }, /* DDR2_DQ0[7:0] */
+			.dq1 = { 12,  14,  15,  13,  10,  9,  8,  11  }, /* DDR2_DQ1[7:0] */
 		},
-		[3] = {
-			{ 15, 12, 13, 14, 8, 9, 10,  11, }, /* DDR3_DQ0[7:0] */
-			{ 7,  6,  4,  5,  2,  0,  3,  1  }, /* DDR3_DQ1[7:0] */
+		.ddr3 = {
+			.dq0 = { 15, 12, 13, 14, 8, 9, 10,  11, }, /* DDR3_DQ0[7:0] */
+			.dq1 = { 7,  6,  4,  5,  2,  0,  3,  1  }, /* DDR3_DQ1[7:0] */
 		},
-		[4] = {
-			{ 6,  5,  4,  7,  0,  3,  2,  1, }, /* DDR4_DQ0[7:0] */
-			{ 15, 14,  13, 12, 11,  8, 9, 10 }, /* DDR4_DQ1[7:0] */
+		.ddr4 = {
+			.dq0 = { 6,  5,  4,  7,  0,  3,  2,  1, }, /* DDR4_DQ0[7:0] */
+			.dq1 = { 15, 14,  13, 12, 11,  8, 9, 10 }, /* DDR4_DQ1[7:0] */
 		},
-		[5] = {
-			{ 11,  9,  10,  8,  12,  14,  13,  15, }, /* DDR5_DQ0[7:0] */
-			{ 1, 0, 2, 3, 6, 7,  5,  4 }, /* DDR5_DQ1[7:0] */
+		.ddr5 = {
+			.dq0 = { 11,  9,  10,  8,  12,  14,  13,  15, }, /* DDR5_DQ0[7:0] */
+			.dq1 = { 1, 0, 2, 3, 6, 7,  5,  4 }, /* DDR5_DQ1[7:0] */
 		},
-		[6] = {
-			{ 2, 3, 0, 1, 5,  4, 6, 7, }, /* DDR6_DQ0[7:0] */
-			{ 13,  14,  15,  12,  11,  10,  8,  9  }, /* DDR6_DQ1[7:0] */
+		.ddr6 = {
+			.dq0 = { 2, 3, 0, 1, 5,  4, 6, 7, }, /* DDR6_DQ0[7:0] */
+			.dq1 = { 13,  14,  15,  12,  11,  10,  8,  9  }, /* DDR6_DQ1[7:0] */
 		},
-		[7] = {
-			{ 14, 13, 15,  12, 9, 8, 10, 11, }, /* DDR7_DQ0[7:0] */
-			{ 4,  5,  1,  2,  6,  0,  3,  7  }, /* DDR7_DQ1[7:0] */
+		.ddr7 = {
+			.dq0 = { 14, 13, 15,  12, 9, 8, 10, 11, }, /* DDR7_DQ0[7:0] */
+			.dq1 = { 4,  5,  1,  2,  6,  0,  3,  7  }, /* DDR7_DQ1[7:0] */
 		},
 	},
 
 	/* DQS CPU<>DRAM map */
-	.dqs_map = {
-		[0] = { 0, 1 },  /* DDR0_DQS[1:0] */
-		[1] = { 1, 0 },  /* DDR1_DQS[1:0] */
-		[2] = { 0, 1 },  /* DDR2_DQS[1:0] */
-		[3] = { 1, 0 },  /* DDR3_DQS[1:0] */
-		[4] = { 0, 1 },  /* DDR4_DQS[1:0] */
-		[5] = { 1, 0 },  /* DDR5_DQS[1:0] */
-		[6] = { 0, 1 },  /* DDR6_DQS[1:0] */
-		[7] = { 1, 0 },  /* DDR7_DQS[1:0] */
+	.lp4x_dqs_map = {
+		.ddr0 = { .dqs0 = 0, .dqs1 = 1 },  /* DDR0_DQS[1:0] */
+		.ddr1 = { .dqs0 = 1, .dqs1 = 0 },  /* DDR1_DQS[1:0] */
+		.ddr2 = { .dqs0 = 0, .dqs1 = 1 },  /* DDR2_DQS[1:0] */
+		.ddr3 = { .dqs0 = 1, .dqs1 = 0 },  /* DDR3_DQS[1:0] */
+		.ddr4 = { .dqs0 = 0, .dqs1 = 1 },  /* DDR4_DQS[1:0] */
+		.ddr5 = { .dqs0 = 1, .dqs1 = 0 },  /* DDR5_DQS[1:0] */
+		.ddr6 = { .dqs0 = 0, .dqs1 = 1 },  /* DDR6_DQS[1:0] */
+		.ddr7 = { .dqs0 = 1, .dqs1 = 0 },  /* DDR7_DQS[1:0] */
 	},
 
-	.ect = 1, /* Enable Early Command Training */
-};
-
-static const struct ddr_memory_cfg board_memcfg = {
-	.mem_type = MEMTYPE_LPDDR4X,
-	.lpddr4_cfg = &voxel_memcfg
+	.ect = true, /* Enable Early Command Training */
 };
 
-const struct ddr_memory_cfg *variant_memory_params(void)
+const struct mb_cfg *variant_memory_params(void)
 {
 	return &board_memcfg;
 }