Subject: [PATCH U-Boot v1] OMAP3: Add Beagle board revision detection

From: Dirk Behme <dirk.behme@googlemail.com>

With BeagleBoard revision C some HW changes are introduced (e.g. PinMUX)
which might need different software handling. For this, GPIO pin 171 (GPIO
module 6, offset 11) can be used to check for board revision. If this pin
is low, we have a rev C board. Else it must be a revision Ax or Bx board.

Global variable beagle_revision_c can be used later to handle board
differences. E.g.

if (beagle_revision_c) {

 /* do special revision C stuff here */

}

See

http://groups.google.com/group/beagleboard/msg/ceb2751f9dde458f

for more details.

Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>

---

This patch is against recent Steve's U-Boot v1 git

http://www.sakoman.net/cgi-bin/gitweb.cgi?p=u-boot-omap3.git;a=shortlog;h=refs/heads/omap3-dev


 board/omap3/beagle/beagle.c        |   28 ++++++++++++++++++++++++++++
 board/omap3/beagle/beagle.h        |    6 +++++-
 include/asm-arm/arch-omap3/omap3.h |    3 ++-
 3 files changed, 35 insertions(+), 2 deletions(-)

Index: u-boot-steve-omap3/board/omap3/beagle/beagle.c
===================================================================
--- u-boot-steve-omap3.orig/board/omap3/beagle/beagle.c
+++ u-boot-steve-omap3/board/omap3/beagle/beagle.c
@@ -54,6 +54,32 @@ int board_init(void)
 }
 
 /******************************************************************************
+ * Routine: board_identify
+ * Description: Detect if we are running on a Beagle revision Ax/Bx or
+ *              Cx. This can be done by GPIO_171. If this is low, we are
+ *              running on a revision C board.
+ *****************************************************************************/
+void board_identify(void)
+{
+	gpio_t *gpio6_base = (gpio_t *)OMAP34XX_GPIO6_BASE;
+
+	/* Configure GPIO 171 as input */
+	writel(readl(&gpio6_base->oe) | GPIO11, &gpio6_base->oe);
+
+	/* Get value of GPIO 171 */
+	beagle_revision_c = readl(&gpio6_base->datain) & BOARD_REVISION_MASK;
+
+	printf("Board revision ");
+	if(beagle_revision_c) {
+		printf("Ax/Bx\n");
+		beagle_revision_c = 0;
+	} else {
+		printf("C\n");
+		beagle_revision_c = 1;
+	}
+}
+
+/******************************************************************************
  * Routine: misc_init_r
  * Description: Configure board specific parts
  *****************************************************************************/
@@ -75,6 +101,8 @@ int misc_init_r(void)
 	writel(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 |
 		GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout);
 
+	board_identify();
+
 	return 0;
 }
 
Index: u-boot-steve-omap3/board/omap3/beagle/beagle.h
===================================================================
--- u-boot-steve-omap3.orig/board/omap3/beagle/beagle.h
+++ u-boot-steve-omap3/board/omap3/beagle/beagle.h
@@ -36,6 +36,10 @@ const omap3_sysinfo sysinfo = {
 #endif
 };
 
+#define BOARD_REVISION_MASK	(0x1 << 11)
+
+unsigned int beagle_revision_c;
+
 /*
  * IEN  - Input Enable
  * IDIS - Input Disable
@@ -267,7 +271,7 @@ const omap3_sysinfo sysinfo = {
  MUX_VAL(CP(I2C4_SCL),		(IEN  | PTU | EN  | M0)) /*I2C4_SCL*/\
  MUX_VAL(CP(I2C4_SDA),		(IEN  | PTU | EN  | M0)) /*I2C4_SDA*/\
  MUX_VAL(CP(HDQ_SIO),		(IDIS | PTU | EN  | M4)) /*GPIO_170*/\
- MUX_VAL(CP(MCSPI1_CLK),	(IEN  | PTD | DIS | M0)) /*McSPI1_CLK*/\
+ MUX_VAL(CP(MCSPI1_CLK),	(IEN  | PTU | EN  | M4)) /*GPIO_171*/\
  MUX_VAL(CP(MCSPI1_SIMO),	(IEN  | PTD | DIS | M0)) /*McSPI1_SIMO*/\
  MUX_VAL(CP(MCSPI1_SOMI),	(IEN  | PTD | DIS | M0)) /*McSPI1_SOMI*/\
  MUX_VAL(CP(MCSPI1_CS0),	(IEN  | PTD | EN  | M0)) /*McSPI1_CS0*/\
Index: u-boot-steve-omap3/include/asm-arm/arch-omap3/omap3.h
===================================================================
--- u-boot-steve-omap3.orig/include/asm-arm/arch-omap3/omap3.h
+++ u-boot-steve-omap3/include/asm-arm/arch-omap3/omap3.h
@@ -97,7 +97,8 @@ typedef struct s32ktimer {
 typedef struct gpio {
 	unsigned char res1[0x34];
 	unsigned int oe;		/* 0x34 */
-	unsigned char res2[0x58];
+	unsigned int datain;		/* 0x38 */
+	unsigned char res2[0x54];
 	unsigned int cleardataout;	/* 0x90 */
 	unsigned int setdataout;	/* 0x94 */
 } gpio_t;