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

integrator: switch to DM serial port 

This switches the Integrator boards over to using the device model
for its serial ports.

Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
This commit is contained in:
Linus Walleij 2015-07-27 11:22:48 +02:00 committed by Tom Rini
parent e0266f4942
commit 3f394e70f0
6 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/Kconfig
View File

@ -458,6 +458,8 @@ config ARCH_HIGHBANK
config ARCH_INTEGRATOR config ARCH_INTEGRATOR
bool "ARM Ltd. Integrator family" bool "ARM Ltd. Integrator family"
select DM
select DM_SERIAL
config ARCH_KEYSTONE config ARCH_KEYSTONE
bool "TI Keystone" bool "TI Keystone"

3
arch/arm/mach-integrator/Kconfig
View File

@ -53,4 +53,7 @@ config SYS_CONFIG_NAME
default "integratorap" if ARCH_INTEGRATOR_AP default "integratorap" if ARCH_INTEGRATOR_AP
default "integratorcp" if ARCH_INTEGRATOR_CP default "integratorcp" if ARCH_INTEGRATOR_CP
config SYS_MALLOC_F_LEN
default 0x2000
endmenu endmenu

18
board/armltd/integrator/integrator.c
View File

@ -20,11 +20,29 @@
#include <common.h> #include <common.h>
#include <netdev.h> #include <netdev.h>
#include <asm/io.h> #include <asm/io.h>
#include <dm/platdata.h>
#include <dm/platform_data/serial_pl01x.h>
#include "arm-ebi.h" #include "arm-ebi.h"
#include "integrator-sc.h" #include "integrator-sc.h"
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
static const struct pl01x_serial_platdata serial_platdata = {
.base = 0x16000000,
#ifdef CONFIG_ARCH_CINTEGRATOR
.type = TYPE_PL011,
.clock = 14745600,
#else
.type = TYPE_PL010,
.clock = 0, /* Not used for PL010 */
#endif
};
U_BOOT_DEVICE(integrator_serials) = {
.name = "serial_pl01x",
.platdata = &serial_platdata,
};
void peripheral_power_enable (void); void peripheral_power_enable (void);
#if defined(CONFIG_SHOW_BOOT_PROGRESS) #if defined(CONFIG_SHOW_BOOT_PROGRESS)

5
include/configs/integrator-common.h
View File

@ -20,6 +20,11 @@
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size*/
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) /* Size of malloc() pool */
/* Serial port PL010/PL011 through the device model */
#define CONFIG_PL01X_SERIAL
#define CONFIG_BAUDRATE 38400
#define CONFIG_CONS_INDEX 0
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_OF_LIBFDT /* enable passing a Device Tree */ #define CONFIG_OF_LIBFDT /* enable passing a Device Tree */

11
include/configs/integratorap.h
View File

@ -20,17 +20,6 @@
/* Integrator/AP-specific configuration */ /* Integrator/AP-specific configuration */
#define CONFIG_SYS_HZ_CLOCK 24000000 /* Timer 1 is clocked at 24Mhz */ #define CONFIG_SYS_HZ_CLOCK 24000000 /* Timer 1 is clocked at 24Mhz */
/*
* PL010 Configuration
*/
#define CONFIG_PL010_SERIAL
#define CONFIG_CONS_INDEX 0
#define CONFIG_BAUDRATE 38400
#define CONFIG_PL01x_PORTS { (void *) (CONFIG_SYS_SERIAL0), (void *) (CONFIG_SYS_SERIAL1) }
#define CONFIG_SYS_SERIAL0 0x16000000
#define CONFIG_SYS_SERIAL1 0x17000000
/* /*
* BOOTP options * BOOTP options
*/ */

9
include/configs/integratorcp.h
View File

@ -28,15 +28,6 @@
#define CONFIG_SMC91111_BASE 0xC8000000 #define CONFIG_SMC91111_BASE 0xC8000000
#undef CONFIG_SMC91111_EXT_PHY #undef CONFIG_SMC91111_EXT_PHY
/* PL011 configuration */
#define CONFIG_PL011_SERIAL
#define CONFIG_PL011_CLOCK 14745600
#define CONFIG_PL01x_PORTS { (void *)CONFIG_SYS_SERIAL0, (void *)CONFIG_SYS_SERIAL1 }
#define CONFIG_CONS_INDEX 0
#define CONFIG_BAUDRATE 38400
#define CONFIG_SYS_SERIAL0 0x16000000
#define CONFIG_SYS_SERIAL1 0x17000000
/* /*
* Command line configuration. * Command line configuration.
*/ */