Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 787affb41b6f0cca797a36383705f30ce9ca5c25

Authored by Stephen Warren
Committed by Tom Rini
1 parent bf71a29c8e
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

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>

Showing 2 changed files with 13 additions and 1 deletions Side-by-side Diff

arch/arm/mach-bcm283x/include/mach/mbox.h
Diff comments   View file @ 787affb
... ... @@ -132,7 +132,7 @@
132 132 * 0x2..0xf from:
133 133 * http://raspberryalphaomega.org.uk/2013/02/06/automatic-raspberry-pi-board-revision-detection-model-a-b1-and-b2/
134 134 * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=32733
135   - * 0x10, 0x11 from swarren's testing
  135 + * http://git.drogon.net/?p=wiringPi;a=blob_plain;f=wiringPi/wiringPi.c;hb=5edd177112c99416f68ba3e8c6c4db6ed942e796
136 136 */
137 137 #define BCM2835_BOARD_REV_B_I2C0_2 0x2
138 138 #define BCM2835_BOARD_REV_B_I2C0_3 0x3
... ... @@ -148,6 +148,8 @@
148 148 #define BCM2835_BOARD_REV_B_PLUS 0x10
149 149 #define BCM2835_BOARD_REV_CM 0x11
150 150 #define BCM2835_BOARD_REV_A_PLUS 0x12
  151 +#define BCM2835_BOARD_REV_B_PLUS_13 0x13
  152 +#define BCM2835_BOARD_REV_CM_14 0x14
151 153 #endif
152 154  
153 155 struct bcm2835_mbox_tag_get_board_rev {
board/raspberrypi/rpi/rpi.c
Diff comments   View file @ 787affb
... ... @@ -165,6 +165,16 @@
165 165 "bcm2835-rpi-a-plus.dtb",
166 166 false,
167 167 },
  168 + [BCM2835_BOARD_REV_B_PLUS_13] = {
  169 + "Model B+",
  170 + "bcm2835-rpi-b-plus.dtb",
  171 + true,
  172 + },
  173 + [BCM2835_BOARD_REV_CM_14] = {
  174 + "Compute Module",
  175 + "bcm2835-rpi-cm.dtb",
  176 + false,
  177 + },
168 178 #endif
169 179 };
170 180