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

rockchip: rk3188: use board_debug_uart_init() for UART io init 

Sync with other rockchip SoCs, use board_debug_uart_init() to
init default UART iomux.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
Kever Yang 2018-11-29 10:07:38 +08:00 committed by Philipp Tomsich
parent af765a49ba
commit 17e5f3a426
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-rockchip/Kconfig
View File

@ -35,6 +35,7 @@ config ROCKCHIP_RK3188
select SPL_RAM select SPL_RAM
select SPL_DRIVERS_MISC_SUPPORT select SPL_DRIVERS_MISC_SUPPORT
select SPL_ROCKCHIP_EARLYRETURN_TO_BROM select SPL_ROCKCHIP_EARLYRETURN_TO_BROM
select DEBUG_UART_BOARD_INIT
select BOARD_LATE_INIT select BOARD_LATE_INIT
select ROCKCHIP_BROM_HELPER select ROCKCHIP_BROM_HELPER
help help

28
arch/arm/mach-rockchip/rk3188-board-spl.c
View File

@ -93,24 +93,21 @@ static int setup_arm_clock(void)
return ret; return ret;
} }
#define GRF_BASE 0x20008000 void board_debug_uart_init(void)
void board_init_f(ulong dummy)
{ {
__maybe_unused struct rk3188_grf * const grf = (void *)GRF_BASE; /* Enable early UART on the RK3188 */
struct udevice *pinctrl, *dev; #define GRF_BASE 0x20008000
int ret; struct rk3188_grf * const grf = (void *)GRF_BASE;
/* Example code showing how to enable the debug UART on RK3188 */
#ifdef EARLY_UART
enum { enum {
GPIO1B1_SHIFT = 2, GPIO1B1_SHIFT = 2,
GPIO1B1_MASK = 3, GPIO1B1_MASK = 3,
GPIO1B1_UART2_SOUT = 1, GPIO1B1_GPIO = 0,
GPIO1B1_UART2_SOUT,
GPIO1B0_SHIFT = 0, GPIO1B0_SHIFT = 0,
GPIO1B0_MASK = 3, GPIO1B0_MASK = 3,
GPIO1B0_UART2_SIN = 1, GPIO1B0_GPIO = 0,
GPIO1B0_UART2_SIN,
}; };
/* Enable early UART on the RK3188 */ /* Enable early UART on the RK3188 */
@ -119,6 +116,15 @@ void board_init_f(ulong dummy)
GPIO1B0_MASK << GPIO1B0_SHIFT, GPIO1B0_MASK << GPIO1B0_SHIFT,
GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT | GPIO1B1_UART2_SOUT << GPIO1B1_SHIFT |
GPIO1B0_UART2_SIN << GPIO1B0_SHIFT); GPIO1B0_UART2_SIN << GPIO1B0_SHIFT);
}
void board_init_f(ulong dummy)
{
struct udevice *pinctrl, *dev;
int ret;
#define EARLY_UART
#ifdef EARLY_UART
/* /*
* Debug UART can be used from here if required: * Debug UART can be used from here if required:
* *