From: Jason Kridner <jkridner@beagleboard.org>
Date: Mon, 14 Mar 2011 08:31:14 +0000 (+0530)
Subject: BeagleBoard: Forced newer revisions to default to xM.
X-Git-Tag: v1.5.0~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2efa178acd56d83c86210b5934895cfb9ea62125;p=pandora-x-loader.git

BeagleBoard: Forced newer revisions to default to xM.

Even if we don't know what revision of the board it is, the default should be to use the
latest known revision, not to simply fail or default to an older revision that could be
detected anyway.

Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
---

diff --git a/board/omap3530beagle/omap3530beagle.c b/board/omap3530beagle/omap3530beagle.c
index 073e35a..15943f5 100644
--- a/board/omap3530beagle/omap3530beagle.c
+++ b/board/omap3530beagle/omap3530beagle.c
@@ -212,6 +212,7 @@ u32 cpu_is_3410(void)
  *		GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3
  *		GPIO173, GPIO172, GPIO171: 1 0 1 => C4
  *		GPIO173, GPIO172, GPIO171: 0 0 0 => XM
+ *		default                          => XM
  ******************************************/
 int beagle_revision(void)
 {
@@ -227,6 +228,18 @@ int beagle_revision(void)
 	rev = omap_get_gpio_datain(173) << 2 |
 		omap_get_gpio_datain(172) << 1 |
 		omap_get_gpio_datain(171);
+
+	/* Default newer board revisions to XM */
+	switch(rev) {
+	case REVISION_AXBX:
+	case REVISION_CX:
+	case REVISION_C4:
+		break;
+	case REVISION_XM:
+	default:
+		rev = REVISION_XM;
+	}
+
 	omap_free_gpio(171);
 	omap_free_gpio(172);
 	omap_free_gpio(173);
@@ -690,7 +703,7 @@ int misc_init_r(void)
 			printf("Beagle Rev C4\n");
 		break;
 	case REVISION_XM:
-		printf("Beagle xM Rev A\n");
+		printf("Beagle xM\n");
 		break;
 	default:
 		printf("Beagle unknown 0x%02x\n", rev);