commit 723182ac829b43641d871d27a49c7b237ce4fc95
author Jack Rosenthal <jrosenth@chromium.org> Thu Apr 08 12:31:24 2021 -0600
committer Commit Bot <commit-bot@chromium.org> Fri Apr 09 04:00:19 2021 +0000
tree 970206b6a31c1ebdfa2615b1963db07c6b9b12f5
parent 8c2f038d1f253afe944975ad404f90df5dba4c59

veyron: drop support for mickey

Board is AUE in M86, builders have been turned down, and the device is
gone from our labs.

This lets us clean up some of the RAM probe logic.

BUG=chromium:990438
TEST=compiles

Change-Id: If2d540fd948d4b5d792d9d523d30306919e282cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/mosys/+/2815899
Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
Commit-Queue: Paul Fagerburg <pfagerburg@chromium.org>
Tested-by: Jack Rosenthal <jrosenth@chromium.org>
Auto-Submit: Jack Rosenthal <jrosenth@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>

platform/arm/pinky/memory.c

diff --git a/platform/arm/pinky/memory.c b/platform/arm/pinky/memory.c
index c4f30d8..6e8800d 100644
--- a/platform/arm/pinky/memory.c
+++ b/platform/arm/pinky/memory.c
@@ -56,82 +56,54 @@
 		return -1;
 	}
 
-	if (!strcmp(intf->name, "Mickey")) {
-		switch (ram_code) {
-		case 0:
-			pinky_dimm_count = 2;
-			pinky_mem_info = &samsung_lpddr3_k3qf2f20em_agce;
-			break;
-		case 3:
-			pinky_dimm_count = 1;
-			pinky_mem_info = &hynix_lpddr3_h9ccnnnbptblbr_nud;
-			break;
-		case 7:
-			pinky_dimm_count = 2;
-			pinky_mem_info = &elpida_lpddr3_edfa164a2ma_jd_f;
-			break;
-		case 17:
-			pinky_dimm_count = 2;
-			pinky_mem_info = &micron_lpddr3_mt52l256m64d2pp_107wtb;
-			break;
-		case 19:
-			pinky_dimm_count = 1;
-			pinky_mem_info = &hynix_lpddr3_h9ccnnnbktmlbr_ntd;
-			break;
-		default:
-			ret = -1;
-			break;
-		}
-	} else {
-		switch (ram_code) {
-		case 0:
-			pinky_dimm_count = 4;
-			pinky_mem_info = &samsung_k4b4g1646e;
-			break;
-		case 2:
-			pinky_dimm_count = 2;
-			pinky_mem_info = &samsung_lpddr3_k4e6e304eb_egce;
-			break;
-		case 4:
-			pinky_dimm_count = 4;
-			pinky_mem_info = &samsung_ddr3l_k4b4g1646d_byk0;
-			break;
-		case 5:
-			pinky_dimm_count = 4;
-			pinky_mem_info = &hynix_ddr3l_h5tc4g63cfr_pba;
-			break;
-		case 6:
-			pinky_dimm_count = 4;
-			pinky_mem_info = &samsung_ddr3l_k4b4g1646q_hyk0;
-			break;
-		case 0x0a:
-			pinky_dimm_count = 4;
-			pinky_mem_info = &nanya_ddr3l_nt5cc256m16dp_di;
-			break;
-		case 0x0c:
-			pinky_dimm_count = 2;
-			pinky_mem_info = &samsung_lpddr3_k4e8e324eb_egcf;
-			break;
-		case 0x0d:
-			pinky_dimm_count = 4;
-			pinky_mem_info = &hynix_ddr3l_h5tc4g63afr_pba;
-			break;
-		case 0x0e:
-			pinky_dimm_count = 4;
-			pinky_mem_info = &samsung_ddr3l_k4b8g1646q_myk0;
-			break;
-		case 0x0f:
-			pinky_dimm_count = 4;
-			pinky_mem_info = &hynix_ddr3l_h5tc8g63amr_pba;
-			break;
-		case 0x10:
-			pinky_dimm_count = 4;
-			pinky_mem_info = &samsung_k4b4g1646e;
-			break;
-		default:
-			ret = -1;
-			break;
-		}
+	switch (ram_code) {
+	case 0:
+		pinky_dimm_count = 4;
+		pinky_mem_info = &samsung_k4b4g1646e;
+		break;
+	case 2:
+		pinky_dimm_count = 2;
+		pinky_mem_info = &samsung_lpddr3_k4e6e304eb_egce;
+		break;
+	case 4:
+		pinky_dimm_count = 4;
+		pinky_mem_info = &samsung_ddr3l_k4b4g1646d_byk0;
+		break;
+	case 5:
+		pinky_dimm_count = 4;
+		pinky_mem_info = &hynix_ddr3l_h5tc4g63cfr_pba;
+		break;
+	case 6:
+		pinky_dimm_count = 4;
+		pinky_mem_info = &samsung_ddr3l_k4b4g1646q_hyk0;
+		break;
+	case 0x0a:
+		pinky_dimm_count = 4;
+		pinky_mem_info = &nanya_ddr3l_nt5cc256m16dp_di;
+		break;
+	case 0x0c:
+		pinky_dimm_count = 2;
+		pinky_mem_info = &samsung_lpddr3_k4e8e324eb_egcf;
+		break;
+	case 0x0d:
+		pinky_dimm_count = 4;
+		pinky_mem_info = &hynix_ddr3l_h5tc4g63afr_pba;
+		break;
+	case 0x0e:
+		pinky_dimm_count = 4;
+		pinky_mem_info = &samsung_ddr3l_k4b8g1646q_myk0;
+		break;
+	case 0x0f:
+		pinky_dimm_count = 4;
+		pinky_mem_info = &hynix_ddr3l_h5tc8g63amr_pba;
+		break;
+	case 0x10:
+		pinky_dimm_count = 4;
+		pinky_mem_info = &samsung_k4b4g1646e;
+		break;
+	default:
+		ret = -1;
+		break;
 	}
 
 	done = 1;

platform/arm/pinky/pinky.c

diff --git a/platform/arm/pinky/pinky.c b/platform/arm/pinky/pinky.c
index 8765b8c..95bbd98 100644
--- a/platform/arm/pinky/pinky.c
+++ b/platform/arm/pinky/pinky.c
@@ -48,7 +48,6 @@
 	const char *fdt_compat;
 } veyron_id_list[] = {
 	{ "Fievel", "google,veyron-fievel" },
-	{ "Mickey", "google,veyron-mickey" },
 	{ "Tiger", "google,veyron-tiger" },
 };