LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: rpi: Move serial to driver model 

Adjust the configuration to use the driver model version of the pl01x
serial driver. Add the required platform data.

Signed-off-by: Simon Glass <sjg@chromium.org>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>
This commit is contained in:
Simon Glass 2014-11-24 21:36:34 -07:00
parent 59c73d7555
commit 115066666c
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
board/raspberrypi/rpi/rpi.c
View File

@ -24,6 +24,7 @@
#include <asm/arch/mbox.h> #include <asm/arch/mbox.h>
#include <asm/arch/sdhci.h> #include <asm/arch/sdhci.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <dm/platform_data/serial_pl01x.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -36,6 +37,17 @@ U_BOOT_DEVICE(bcm2835_gpios) = {
.platdata = &gpio_platdata, .platdata = &gpio_platdata,
}; };
static const struct pl01x_serial_platdata serial_platdata = {
.base = 0x20201000,
.type = TYPE_PL011,
.clock = 3000000,
};
U_BOOT_DEVICE(bcm2835_serials) = {
.name = "serial_pl01x",
.platdata = &serial_platdata,
};
struct msg_get_arm_mem { struct msg_get_arm_mem {
struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_hdr hdr;
struct bcm2835_mbox_tag_get_arm_mem get_arm_mem; struct bcm2835_mbox_tag_get_arm_mem get_arm_mem;

6
include/configs/rpi.h
View File

@ -34,6 +34,7 @@
#define CONFIG_DM #define CONFIG_DM
#define CONFIG_CMD_DM #define CONFIG_CMD_DM
#define CONFIG_DM_GPIO #define CONFIG_DM_GPIO
#define CONFIG_DM_SERIAL
/* Memory layout */ /* Memory layout */
#define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_NR_DRAM_BANKS 1
@ -51,6 +52,7 @@
CONFIG_SYS_SDRAM_SIZE - \ CONFIG_SYS_SDRAM_SIZE - \
GENERATED_GBL_DATA_SIZE) GENERATED_GBL_DATA_SIZE)
#define CONFIG_SYS_MALLOC_LEN SZ_4M #define CONFIG_SYS_MALLOC_LEN SZ_4M
#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)
#define CONFIG_SYS_MEMTEST_START 0x00100000 #define CONFIG_SYS_MEMTEST_START 0x00100000
#define CONFIG_SYS_MEMTEST_END 0x00200000 #define CONFIG_SYS_MEMTEST_END 0x00200000
#define CONFIG_LOADADDR 0x00200000 #define CONFIG_LOADADDR 0x00200000
@ -92,9 +94,7 @@
#endif #endif
/* Console UART */ /* Console UART */
#define CONFIG_PL011_SERIAL #define CONFIG_PL01X_SERIAL
#define CONFIG_PL011_CLOCK 3000000
#define CONFIG_PL01x_PORTS { (void *)0x20201000 }
#define CONFIG_CONS_INDEX 0 #define CONFIG_CONS_INDEX 0
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200