WIP: RPi 3 port (32-bit)

FIXME:
- Describe

NOTE: This requires the following in config.txt:
    enable_uart=1

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>

arch/arm/mach-bcm283x/Kconfig

@@ -14,11 +14,17 @@ config TARGET_RPI_2
 	select CPU_V7
 	select ARMV7_LPAE
 
+config TARGET_RPI_3_32B
+	bool "Raspberry Pi 3 32-bit build"
+	select CPU_V7
+	select ARMV7_LPAE
+
 endchoice
 
 config SYS_BOARD
 	default "rpi" if TARGET_RPI
 	default "rpi_2" if TARGET_RPI_2
+	default "rpi_3_32b" if TARGET_RPI_3_32B
 
 config SYS_VENDOR
 	default "raspberrypi"
@@ -29,5 +35,6 @@ config SYS_SOC
 config SYS_CONFIG_NAME
 	default "rpi" if TARGET_RPI
 	default "rpi_2" if TARGET_RPI_2
+	default "rpi_3_32b" if TARGET_RPI_3_32B
 
 endmenu

board/raspberrypi/rpi/rpi.c

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2012-2013,2015 Stephen Warren
+ * (C) Copyright 2012-2016 Stephen Warren
  *
  * SPDX-License-Identifier:	GPL-2.0
  */
@@ -18,6 +18,7 @@
 #include <asm/arch/sdhci.h>
 #include <asm/global_data.h>
 #include <dm/platform_data/serial_pl01x.h>
+#include <dm/platform_data/serial_bcm283x_mu.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -30,6 +31,7 @@ U_BOOT_DEVICE(bcm2835_gpios) = {
 	.platdata = &gpio_platdata,
 };
 
+#ifdef CONFIG_PL01X_SERIAL
 static const struct pl01x_serial_platdata serial_platdata = {
 #ifndef CONFIG_BCM2835
 	.base = 0x3f201000,
@@ -44,6 +46,19 @@ U_BOOT_DEVICE(bcm2835_serials) = {
 	.name = "serial_pl01x",
 	.platdata = &serial_platdata,
 };
+#else
+static const struct bcm283x_mu_serial_platdata serial_platdata = {
+	.base = 0x3f215040,
+	.clock = 250000000,
+	/* FIXME: Set to true once the FW programs the correct divider */
+	.skip_init = false,
+};
+
+U_BOOT_DEVICE(bcm2837_serials) = {
+	.name = "serial_bcm283x_mu",
+	.platdata = &serial_platdata,
+};
+#endif
 
 struct msg_get_arm_mem {
 	struct bcm2835_mbox_hdr hdr;
@@ -99,7 +114,9 @@ struct rpi_model {
 
 static const struct rpi_model rpi_model_unknown = {
 	"Unknown model",
-#ifdef CONFIG_BCM2836
+#if defined(CONFIG_BCM2837)
+	"bcm2837-rpi-other.dtb",
+#elif defined(CONFIG_BCM2836)
 	"bcm2836-rpi-other.dtb",
 #else
 	"bcm2835-rpi-other.dtb",
@@ -113,6 +130,11 @@ static const struct rpi_model rpi_models_new_scheme[] = {
 		"bcm2836-rpi-2-b.dtb",
 		true,
 	},
+	[0x8] = {
+		"3 Model B",
+		"bcm2837-rpi-3-b.dtb",
+		true,
+	},
 	[0x9] = {
 		"Zero",
 		"bcm2835-rpi-zero.dtb",

board/raspberrypi/rpi_3_32b/MAINTAINERS

@@ -0,0 +1,6 @@
+RPI_3_32B BOARD
+M:	Stephen Warren <swarren@wwwdotorg.org>
+S:	Maintained
+F:	board/raspberrypi/rpi_3_32b/
+F:	include/configs/rpi_3_32b.h
+F:	configs/rpi_3_32b_defconfig

board/raspberrypi/rpi_3_32b/Makefile

@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2012-2016 Stephen Warren <swarren@wwwdotorg.org>
+#
+# SPDX-License-Identifier:	GPL-2.0
+#
+
+obj-y	:= ../rpi/rpi.o

configs/rpi_3_32b_defconfig

@@ -0,0 +1,11 @@
+CONFIG_ARM=y
+CONFIG_ARCH_BCM283X=y
+CONFIG_TARGET_RPI_3_32B=y
+CONFIG_OF_BOARD_SETUP=y
+CONFIG_SYS_PROMPT="U-Boot> "
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_GPIO=y
+CONFIG_PHYS_TO_BUS=y
+CONFIG_OF_LIBFDT=y

include/configs/rpi-common.h

@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2012,2015 Stephen Warren
+ * (C) Copyright 2012-2016 Stephen Warren
  *
  * SPDX-License-Identifier:	GPL-2.0
  */
@@ -24,6 +24,9 @@
  * We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation
  * chose to use someone else's previously registered machine ID (3139, MX51_GGC)
  * rather than obtaining a valid ID:-/
+ *
+ * For the bcm2837, hopefully a machine type is not needed, since everything
+ * is DT.
  */
 #ifdef CONFIG_BCM2835
 #define CONFIG_MACH_TYPE		MACH_TYPE_BCM2708
@@ -94,7 +97,11 @@
 #endif
 
 /* Console UART */
+#ifdef CONFIG_BCM2837
+#define CONFIG_BCM283X_MU_SERIAL
+#else
 #define CONFIG_PL01X_SERIAL
+#endif
 #define CONFIG_CONS_INDEX		0
 #define CONFIG_BAUDRATE			115200
 

include/configs/rpi_3_32b.h

@@ -0,0 +1,16 @@
+/*
+ * (C) Copyright 2012-2016 Stephen Warren <swarren@wwwdotorg.org>
+ *
+ * SPDX-License-Identifier:	GPL-2.0
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_BCM2837
+#define CONFIG_SYS_CACHELINE_SIZE		64
+
+#include "rpi-common.h"
+
+#endif