Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / board / raspberrypi / rpi / rpi.c

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index c8924d4..153a1fd 100644 (file)
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -1,13 +1,12 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * (C) Copyright 2012-2016 Stephen Warren
- *
- * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>
-#include <inttypes.h>
 #include <config.h>
 #include <dm.h>
+#include <environment.h>
 #include <efi_loader.h>
 #include <fdt_support.h>
 #include <fdt_simplefb.h>
@@ -69,14 +68,7 @@ struct msg_get_clock_rate {
 #endif
 
 /*
- * 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
- * http://git.drogon.net/?p=wiringPi;a=blob;f=wiringPi/wiringPi.c;h=503151f61014418b9c42f4476a6086f75cd4e64b;hb=refs/heads/master#l922
- *
- * In http://lists.denx.de/pipermail/u-boot/2016-January/243752.html
- * ("[U-Boot] [PATCH] rpi: fix up Model B entries") Dom Cobley at the RPi
- * Foundation stated that the following source was accurate:
- * https://github.com/AndrewFromMelbourne/raspberry_pi_revision
+ * https://www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/README.md
  */
 struct rpi_model {
        const char *name;
@@ -91,11 +83,36 @@ static const struct rpi_model rpi_model_unknown = {
 };
 
 static const struct rpi_model rpi_models_new_scheme[] = {
+       [0x0] = {
+               "Model A",
+               DTB_DIR "bcm2835-rpi-a.dtb",
+               false,
+       },
+       [0x1] = {
+               "Model B",
+               DTB_DIR "bcm2835-rpi-b.dtb",
+               true,
+       },
+       [0x2] = {
+               "Model A+",
+               DTB_DIR "bcm2835-rpi-a-plus.dtb",
+               false,
+       },
+       [0x3] = {
+               "Model B+",
+               DTB_DIR "bcm2835-rpi-b-plus.dtb",
+               true,
+       },
        [0x4] = {
                "2 Model B",
                DTB_DIR "bcm2836-rpi-2-b.dtb",
                true,
        },
+       [0x6] = {
+               "Compute Module",
+               DTB_DIR "bcm2835-rpi-cm.dtb",
+               false,
+       },
        [0x8] = {
                "3 Model B",
                DTB_DIR "bcm2837-rpi-3-b.dtb",
@@ -106,11 +123,26 @@ static const struct rpi_model rpi_models_new_scheme[] = {
                DTB_DIR "bcm2835-rpi-zero.dtb",
                false,
        },
+       [0xA] = {
+               "Compute Module 3",
+               DTB_DIR "bcm2837-rpi-cm3.dtb",
+               false,
+       },
        [0xC] = {
                "Zero W",
                DTB_DIR "bcm2835-rpi-zero-w.dtb",
                false,
        },
+       [0xD] = {
+               "3 Model B+",
+               DTB_DIR "bcm2837-rpi-3-b-plus.dtb",
+               true,
+       },
+       [0xE] = {
+               "3 Model A+",
+               DTB_DIR "bcm2837-rpi-3-a-plus.dtb",
+               false,
+       },
 };
 
 static const struct rpi_model rpi_models_old_scheme[] = {
@@ -349,7 +381,7 @@ static void set_serial_number(void)
                return;
        }
 
-       snprintf(serial_string, sizeof(serial_string), "%016" PRIx64,
+       snprintf(serial_string, sizeof(serial_string), "%016llx",
                 msg->get_board_serial.body.resp.serial);
        env_set("serial#", serial_string);
 }
@@ -420,54 +452,11 @@ static void get_board_rev(void)
        printf("RPI %s (0x%x)\n", model->name, revision);
 }
 
-#ifndef CONFIG_PL01X_SERIAL
-static bool rpi_is_serial_active(void)
-{
-       int serial_gpio = 15;
-       struct udevice *dev;
-
-       /*
-        * The RPi3 disables the mini uart by default. The easiest way to find
-        * out whether it is available is to check if the RX pin is muxed.
-        */
-
-       if (uclass_first_device(UCLASS_PINCTRL, &dev) || !dev)
-               return true;
-
-       if (pinctrl_get_gpio_mux(dev, 0, serial_gpio) != BCM2835_GPIO_ALT5)
-               return false;
-
-       return true;
-}
-
-/* Disable mini-UART I/O if it's not pinmuxed to our pins.
- * The firmware only enables it if explicitly done in config.txt: enable_uart=1
- */
-static void rpi_disable_inactive_uart(void)
-{
-       struct udevice *dev;
-       struct bcm283x_mu_serial_platdata *plat;
-
-       if (uclass_get_device_by_driver(UCLASS_SERIAL,
-                                       DM_GET_DRIVER(serial_bcm283x_mu),
-                                       &dev) || !dev)
-               return;
-
-       if (!rpi_is_serial_active()) {
-               plat = dev_get_platdata(dev);
-               plat->disabled = true;
-       }
-}
-#endif
-
 int board_init(void)
 {
 #ifdef CONFIG_HW_WATCHDOG
        hw_watchdog_init();
 #endif
-#ifndef CONFIG_PL01X_SERIAL
-       rpi_disable_inactive_uart();
-#endif
 
        get_board_rev();