From cd080999089243aa540b297a11b54cf5fa68db0b Mon Sep 17 00:00:00 2001
From: Frank Wu <frank_wu@compal.corp-partner.google.com>
Date: Fri, 7 Aug 2020 15:28:03 +0800
Subject: mb/google/volteer/var/halvor: Update dq/dqs mappings

Update dq/dqs mappings based on halvor schematics.

BUG=b:162892573
BRANCH=none
TEST=FW_NAME=halvor emerge-volteer coreboot chromeos-bootimage
Then boot Halvor successfully.

Signed-off-by: Frank Wu <frank_wu@compal.corp-partner.google.com>
Change-Id: Id4ffcbd4f015afe6507ed2b1d562519c5b240409
Reviewed-on: https://review.coreboot.org/c/coreboot/+/44284
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
---
 .../google/volteer/variants/halvor/Makefile.inc    |  2 +
 .../google/volteer/variants/halvor/memory.c        | 65 ++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 src/mainboard/google/volteer/variants/halvor/memory.c

(limited to 'src/mainboard/google/volteer/variants')

diff --git a/src/mainboard/google/volteer/variants/halvor/Makefile.inc b/src/mainboard/google/volteer/variants/halvor/Makefile.inc
index 13269db5ec..b0bfc567ff 100644
--- a/src/mainboard/google/volteer/variants/halvor/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/halvor/Makefile.inc
@@ -2,4 +2,6 @@
 
 bootblock-y += gpio.c
 
+romstage-y += memory.c
+
 ramstage-y += gpio.c
diff --git a/src/mainboard/google/volteer/variants/halvor/memory.c b/src/mainboard/google/volteer/variants/halvor/memory.c
new file mode 100644
index 0000000000..edbb681a4e
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/halvor/memory.c
@@ -0,0 +1,65 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <baseboard/variants.h>
+
+static const struct lpddr4x_cfg halvor_memcfg = {
+	/* DQ byte map */
+	.dq_map = {
+		[0] = {
+			{ 10, 12, 13,  9, 11,  8, 15, 14,}, /* DDR0_DQ0[7:0] */
+			{ 3,  0,  1,  5,  4,  7,  6,  2  }, /* DDR0_DQ1[7:0] */
+		},
+		[1] = {
+			{ 8, 10, 13,  9, 12, 15, 11, 14, }, /* DDR1_DQ0[7:0] */
+			{ 3,  5,  7,  2,  1,  0,  4,  6  }, /* DDR1_DQ1[7:0] */
+		},
+		[2] = {
+			{ 1,  3,  0,  2,  5,  4,  7,  6, }, /* DDR2_DQ0[7:0] */
+			{ 15, 14, 12, 13, 8,  9, 10, 11  }, /* DDR2_DQ1[7:0] */
+		},
+		[3] = {
+			{ 8,  9, 10, 11, 14, 12, 15, 13, }, /* DDR3_DQ0[7:0] */
+			{ 5,  6,  7,  4,  2,  3,  1,  0  }, /* DDR3_DQ1[7:0] */
+		},
+		[4] = {
+			{ 9,  8, 10, 11, 12, 13, 14, 15, }, /* DDR4_DQ0[7:0] */
+			{ 6,  7,  4,  5,  0,  2,  1,  3  }, /* DDR4_DQ1[7:0] */
+		},
+		[5] = {
+			{ 0,  1,  3,  2,  7,  4,  5,  6, }, /* DDR5_DQ0[7:0] */
+			{ 15, 14,  9, 12,  8, 13, 11, 10 }, /* DDR5_DQ1[7:0] */
+		},
+		[6] = {
+			{ 7,  5,  3,  6,  1,  0,  4,  2, }, /* DDR6_DQ0[7:0] */
+			{ 12, 14, 15, 13,  8, 11,  9, 10 }, /* DDR6_DQ1[7:0] */
+		},
+		[7] = {
+			{ 3,  7,  1,  6,  5,  4,  2,  0, }, /* DDR7_DQ0[7:0] */
+			{ 12, 11,  8, 14, 10,  9, 15, 13 }, /* DDR7_DQ1[7:0] */
+		},
+	},
+
+	/* DQS CPU<>DRAM map */
+	.dqs_map = {
+		[0] = { 1, 0 },  /* 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] = { 1, 0 },  /* DDR4_DQS[1:0] */
+		[5] = { 0, 1 },  /* DDR5_DQS[1:0] */
+		[6] = { 0, 1 },  /* DDR6_DQS[1:0] */
+		[7] = { 0, 1 },  /* DDR7_DQS[1:0] */
+	},
+
+	.ect = 1, /* Enable Early Command Training */
+};
+
+static const struct ddr_memory_cfg board_memcfg = {
+	.mem_type = MEMTYPE_LPDDR4X,
+	.lpddr4_cfg = &halvor_memcfg
+};
+
+const struct ddr_memory_cfg *variant_memory_params(void)
+{
+	return &board_memcfg;
+}
-- 
cgit v1.2.3