commit 7b10b48cfb1983f03f2247449ed4c1ed627974dd
author Duncan Laurie <dlaurie@chromium.org> Tue Jun 03 16:01:31 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Mon Jun 09 22:21:25 2014 +0000
tree 61c3665af9b38aa7998c4a0744ca196358df76c5
parent aeb759e681dc0ca7b1f9d82ae373093c3fbca762

samus: Update GPIO memory straps

Additional GPIO used for memory straps.  This is currently GPIO66
but is moving to GPIO65 for the next build as GPIO66 is a PCH strap.

Also remove the Bolt board since it is not longer around.

BUG=chrome-os-partner:25491
BRANCH=samus
TEST=Tested with GPIO66 on Samus 1.9

Change-Id: Ifc9fdff8fe6e28146cca0d5bed124374f7e77edc
Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/202519
Reviewed-by: David Hendricks <dhendrix@chromium.org>

platform/experimental/slippy/memory.c

diff --git a/platform/experimental/slippy/memory.c b/platform/experimental/slippy/memory.c
index 47ba702..60f0ecb 100644
--- a/platform/experimental/slippy/memory.c
+++ b/platform/experimental/slippy/memory.c
@@ -90,6 +90,7 @@
  * GPIO67: Bit 0
  * GPIO68: Bit 1
  * GPIO69: Bit 2
+ * GPIO65: Bit 3
  */
 static int samus_get_spd_index(struct platform_intf *intf)
 {
@@ -98,6 +99,7 @@
 	struct gpio_map ram_id0 = { 67, GPIO_IN, 0, 2, 3 };
 	struct gpio_map ram_id1 = { 68, GPIO_IN, 0, 2, 4 };
 	struct gpio_map ram_id2 = { 69, GPIO_IN, 0, 2, 5 };
+	struct gpio_map ram_id3 = { 65, GPIO_IN, 0, 2, 2 };
 
 	if ((val = intf->cb->gpio->read(intf, &ram_id0)) < 0)
 		return -1;
@@ -111,6 +113,10 @@
 		return -1;
 	spd_index |= val << 2;
 
+	if ((val = intf->cb->gpio->read(intf, &ram_id3)) < 0)
+		return -1;
+	spd_index |= val << 3;
+
 	return spd_index;
 }
 
@@ -152,9 +158,6 @@
 		 * {1,1,0} = 2GB Elpida
 		 */
 		return slippy_get_spd_index(intf) >= 4 ? 1 : 2;
-	} else if (!strncmp(intf->name, "Bolt", 4)) {
-		/* Bolt has 2 DIMM config */
-		return 2;
 	} else if (!strncmp(intf->name, "Samus", 5)) {
 		/* Samus has 2 DIMM config */
 		return 2;
@@ -211,9 +214,8 @@
 	if ((file = cbfs_find("spd.bin", bootblock, size)) == NULL)
 		return -1;
 
-	/* Special case for Samus/Bolt */
-	if (!strncmp(intf->name, "Samus", 5) ||
-	    !strncmp(intf->name, "Bolt", 4))
+	/* Special case for Samus */
+	if (!strncmp(intf->name, "Samus", 5))
 		spd_index = samus_get_spd_index(intf);
 	else
 		spd_index = slippy_get_spd_index(intf);

platform/experimental/slippy/slippy.c

diff --git a/platform/experimental/slippy/slippy.c b/platform/experimental/slippy/slippy.c
index 49be3d1..a09eda1 100644
--- a/platform/experimental/slippy/slippy.c
+++ b/platform/experimental/slippy/slippy.c
@@ -53,10 +53,6 @@
 };
 
 static const struct probe_ids probe_id_list[] = {
-	{ { "Bolt", NULL },
-	  { "X86 BOLT", NULL },
-	  { "Google_Bolt", NULL },
-	},
 	{ { "Falco", NULL },
 	  { "X86 FALCO", NULL },
 	  { "Google_Falco", NULL },