summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Warren <swarren@wwwdotorg.org>2015-04-12 21:43:25 -0600
committerTom Rini <trini@konsulko.com>2015-04-13 08:48:36 -0400
commit787affb41b6f0cca797a36383705f30ce9ca5c25 (patch)
tree1f7f84a4c34a70f208efe1e38634c1262d564854
parentbf71a29c8e611a5c7f18d0572edeae82189dd3a2 (diff)
downloadu-boot-imx-787affb41b6f0cca797a36383705f30ce9ca5c25.zip
u-boot-imx-787affb41b6f0cca797a36383705f30ce9ca5c25.tar.gz
u-boot-imx-787affb41b6f0cca797a36383705f30ce9ca5c25.tar.bz2
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>
-rw-r--r--arch/arm/mach-bcm283x/include/mach/mbox.h4
-rw-r--r--board/raspberrypi/rpi/rpi.c10
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm283x/include/mach/mbox.h b/arch/arm/mach-bcm283x/include/mach/mbox.h
index 04bf480..54d369c 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 a105953..96fe870 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
};