ARM: bcm283x: Allocate all mailbox buffers cacheline aligned

[karo-tx-uboot.git] / board / raspberrypi / rpi / rpi.c

diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c
index c18271fce823f7523a8958352701bfe3ea7086c7..d21750e2a0434d262a139681f805adc511abe847 100644 (file)
--- a/board/raspberrypi/rpi/rpi.c
+++ b/board/raspberrypi/rpi/rpi.c
@@ -1,23 +1,14 @@
 /*
- * (C) Copyright 2012-2013 Stephen Warren
+ * (C) Copyright 2012-2013,2015 Stephen Warren
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>
 #include <config.h>
 #include <dm.h>
 #include <fdt_support.h>
+#include <fdt_simplefb.h>
 #include <lcd.h>
 #include <mmc.h>
 #include <asm/gpio.h>
@@ -38,7 +29,11 @@ U_BOOT_DEVICE(bcm2835_gpios) = {
 };
 
 static const struct pl01x_serial_platdata serial_platdata = {
+#ifdef CONFIG_BCM2836
+       .base = 0x3f201000,
+#else
        .base = 0x20201000,
+#endif
        .type = TYPE_PL011,
        .clock = 3000000,
 };
@@ -86,9 +81,20 @@ static const struct {
 } models[] = {
        [0] = {
                "Unknown model",
+#ifdef CONFIG_BCM2836
+               "bcm2836-rpi-other.dtb",
+#else
                "bcm2835-rpi-other.dtb",
+#endif
                false,
        },
+#ifdef CONFIG_BCM2836
+       [BCM2836_BOARD_REV_2_B] = {
+               "2 Model B",
+               "bcm2836-rpi-2-b.dtb",
+               true,
+       },
+#else
        [BCM2835_BOARD_REV_B_I2C0_2] = {
                "Model B (no P5)",
                "bcm2835-rpi-b-i2c0.dtb",
@@ -159,13 +165,24 @@ 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
 };
 
 u32 rpi_board_rev = 0;
 
 int dram_init(void)
 {
-       ALLOC_ALIGN_BUFFER(struct msg_get_arm_mem, msg, 1, 16);
+       ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_arm_mem, msg, 1);
        int ret;
 
        BCM2835_MBOX_INIT_HDR(msg);
@@ -195,7 +212,7 @@ static void set_fdtfile(void)
 
 static void set_usbethaddr(void)
 {
-       ALLOC_ALIGN_BUFFER(struct msg_get_mac_address, msg, 1, 16);
+       ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_mac_address, msg, 1);
        int ret;
 
        if (!models[rpi_board_rev].has_onboard_eth)
@@ -228,7 +245,7 @@ int misc_init_r(void)
 
 static int power_on_module(u32 module)
 {
-       ALLOC_ALIGN_BUFFER(struct msg_set_power_state, msg_pwr, 1, 16);
+       ALLOC_CACHE_ALIGN_BUFFER(struct msg_set_power_state, msg_pwr, 1);
        int ret;
 
        BCM2835_MBOX_INIT_HDR(msg_pwr);
@@ -252,7 +269,7 @@ static int power_on_module(u32 module)
 
 static void get_board_rev(void)
 {
-       ALLOC_ALIGN_BUFFER(struct msg_get_board_rev, msg, 1, 16);
+       ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_board_rev, msg, 1);
        int ret;
        const char *name;
 
@@ -266,7 +283,22 @@ static void get_board_rev(void)
                return;
        }
 
+       /*
+        * For details of old-vs-new scheme, see:
+        * https://github.com/pimoroni/RPi.version/blob/master/RPi/version.py
+        * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=99293&p=690282
+        * (a few posts down)
+        *
+        * For the RPi 1, bit 24 is the "warranty bit", so we mask off just the
+        * lower byte to use as the board rev:
+        * http://www.raspberrypi.org/forums/viewtopic.php?f=63&t=98367&start=250
+        * http://www.raspberrypi.org/forums/viewtopic.php?f=31&t=20594
+        */
        rpi_board_rev = msg->get_board_rev.body.resp.rev;
+       if (rpi_board_rev & 0x800000)
+               rpi_board_rev = (rpi_board_rev >> 4) & 0xff;
+       else
+               rpi_board_rev &= 0xff;
        if (rpi_board_rev >= ARRAY_SIZE(models)) {
                printf("RPI: Board rev %u outside known range\n",
                       rpi_board_rev);
@@ -278,7 +310,7 @@ static void get_board_rev(void)
        }
 
        name = models[rpi_board_rev].name;
-       printf("RPI model: %s\n", name);
+       printf("RPI %s\n", name);
 }
 
 int board_init(void)
@@ -292,7 +324,7 @@ int board_init(void)
 
 int board_mmc_init(bd_t *bis)
 {
-       ALLOC_ALIGN_BUFFER(struct msg_get_clock_rate, msg_clk, 1, 16);
+       ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_clock_rate, msg_clk, 1);
        int ret;
 
        power_on_module(BCM2835_MBOX_POWER_DEVID_SDHCI);