clk: uniphier: add Media I/O clock driver for UniPhier SoCs

[u-boot] / board / raspberrypi / rpi / rpi.c

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index 4b80d7b742fdb090a9b12cadddf54210788d14ed..7f4fe64385e4d31419713de109947151aa26759e 100644 (file)
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -78,6 +78,11 @@ struct msg_get_clock_rate {
  * 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
  */
 struct rpi_model {
        const char *name;
@@ -110,28 +115,28 @@ static const struct rpi_model rpi_models_new_scheme[] = {
 
 static const struct rpi_model rpi_models_old_scheme[] = {
        [0x2] = {
-               "Model B (no P5)",
-               "bcm2835-rpi-b-i2c0.dtb",
+               "Model B",
+               "bcm2835-rpi-b.dtb",
                true,
        },
        [0x3] = {
-               "Model B (no P5)",
-               "bcm2835-rpi-b-i2c0.dtb",
+               "Model B",
+               "bcm2835-rpi-b.dtb",
                true,
        },
        [0x4] = {
-               "Model B",
-               "bcm2835-rpi-b.dtb",
+               "Model B rev2",
+               "bcm2835-rpi-b-rev2.dtb",
                true,
        },
        [0x5] = {
-               "Model B",
-               "bcm2835-rpi-b.dtb",
+               "Model B rev2",
+               "bcm2835-rpi-b-rev2.dtb",
                true,
        },
        [0x6] = {
-               "Model B",
-               "bcm2835-rpi-b.dtb",
+               "Model B rev2",
+               "bcm2835-rpi-b-rev2.dtb",
                true,
        },
        [0x7] = {
@@ -254,6 +259,9 @@ static void set_usbethaddr(void)
 
        eth_setenv_enetaddr("usbethaddr", msg->get_mac_address.body.resp.mac);
 
+       if (!getenv("ethaddr"))
+               setenv("ethaddr", getenv("usbethaddr"));
+
        return;
 }