From: Stephen Warren <swarren@wwwdotorg.org>
Date: Mon, 13 Apr 2015 03:43:25 +0000 (-0600)
Subject: ARM: rpi: add a couple more revision IDs
X-Git-Tag: v2015.04~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=787affb41b6f0cca797a36383705f30ce9ca5c25;p=oweals%2Fu-boot.git

ARM: rpi: add a couple more revision IDs

According to Gordon Henderson's WiringPi library, there are some more
Pi revision IDs out there. Add support for them.

http://git.drogon.net/?p=wiringPi;a=blob_plain;f=wiringPi/wiringPi.c;hb=5edd177112c99416f68ba3e8c6c4db6ed942e796

At least ID 0x13 is out in the wild:

Reported-by: Chee-Yang Chau <cychau@gmail.com>
Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
---

diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
index 04bf480a54..54d369c46c 100644
--- a/arch/arm/mach-bcm283x/include/mach/mbox.h
+++ b/arch/arm/mach-bcm283x/include/mach/mbox.h
@@ -132,7 +132,7 @@ struct bcm2835_mbox_tag_hdr {
  * 0x2..0xf from:
  * http://raspberryalphaomega.org.uk/2013/02/06/automatic-raspberry-pi-board-revision-detection-model-a-b1-and-b2/
  * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=32733
- * 0x10, 0x11 from swarren's testing
+ * http://git.drogon.net/?p=wiringPi;a=blob_plain;f=wiringPi/wiringPi.c;hb=5edd177112c99416f68ba3e8c6c4db6ed942e796
  */
 #define BCM2835_BOARD_REV_B_I2C0_2	0x2
 #define BCM2835_BOARD_REV_B_I2C0_3	0x3
@@ -148,6 +148,8 @@ struct bcm2835_mbox_tag_hdr {
 #define BCM2835_BOARD_REV_B_PLUS	0x10
 #define BCM2835_BOARD_REV_CM		0x11
 #define BCM2835_BOARD_REV_A_PLUS	0x12
+#define BCM2835_BOARD_REV_B_PLUS_13	0x13
+#define BCM2835_BOARD_REV_CM_14		0x14
 #endif
 
 struct bcm2835_mbox_tag_get_board_rev {
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index a105953541..96fe870645 100644
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -165,6 +165,16 @@ static const struct {
 		"bcm2835-rpi-a-plus.dtb",
 		false,
 	},
+	[BCM2835_BOARD_REV_B_PLUS_13] = {
+		"Model B+",
+		"bcm2835-rpi-b-plus.dtb",
+		true,
+	},
+	[BCM2835_BOARD_REV_CM_14] = {
+		"Compute Module",
+		"bcm2835-rpi-cm.dtb",
+		false,
+	},
 #endif
 };