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

rockchip: rk3399: spl: remove hard-coded addresses for GRF and SGRF

Browse Source 
On the RK3399, we will have either OF_PLATDATA or full OF_CONTROL
enabled: this allows the use of syscon to retrieve the addresses of
GRF and SGRF (except for the early debug UART setup, which runs so
early that the device-model is not initialised).

This removes the hard-coded addresses and goes through syscon to
retrieve the base-addresses of GRF and SGRF. After that, we use
the structure definitions to locate the respective registers.

In addition to this, the inclusion of header files is also cleaned up:
- all headers are included at the beginning (there was a spurious
  inclusion of the grf header from within a function)
- all #include statements for unused headers are removed
- the remaining #include statements are sorted (while keeping common.h
  included in front)

Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Philipp Tomsich 2017-08-29 18:24:05 +02:00
parent c254b29fef
commit ba1657338b
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arch/arm/mach-rockchip/rk3399-board-spl.c
View File

@ -5,19 +5,17 @@
*/ */
#include <common.h> #include <common.h>
#include <debug_uart.h>
#include <dm.h>
#include <ram.h>
#include <spl.h>
#include <asm/gpio.h>
#include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/grf_rk3399.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/periph.h> #include <asm/arch/periph.h>
#include <asm/arch/sdram.h> #include <asm/io.h>
#include <asm/arch/timer.h> #include <debug_uart.h>
#include <dm.h>
#include <dm/pinctrl.h> #include <dm/pinctrl.h>
#include <power/regulator.h> #include <ram.h>
#include <spl.h>
#include <syscon.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -53,7 +51,6 @@ void secure_timer_init(void)
void board_debug_uart_init(void) void board_debug_uart_init(void)
{ {
#include <asm/arch/grf_rk3399.h>
#define GRF_BASE 0xff770000 #define GRF_BASE 0xff770000
struct rk3399_grf_regs * const grf = (void *)GRF_BASE; struct rk3399_grf_regs * const grf = (void *)GRF_BASE;
@ -80,13 +77,12 @@ void board_debug_uart_init(void)
#endif #endif
} }
#define GRF_EMMCCORE_CON11 0xff77f02c
#define SGRF_DDR_RGN_CON16 0xff330040
#define SGRF_SLV_SECURE_CON4 0xff33e3d0
void board_init_f(ulong dummy) void board_init_f(ulong dummy)
{ {
struct udevice *pinctrl; struct udevice *pinctrl;
struct udevice *dev; struct udevice *dev;
struct rk3399_pmusgrf_regs *sgrf;
struct rk3399_grf_regs *grf;
int ret; int ret;
#define EARLY_UART #define EARLY_UART
@ -103,9 +99,6 @@ void board_init_f(ulong dummy)
printascii("U-Boot SPL board init"); printascii("U-Boot SPL board init");
#endif #endif
/* Emmc clock generator: disable the clock multipilier */
rk_clrreg(GRF_EMMCCORE_CON11, 0x0ff);
ret = spl_early_init(); ret = spl_early_init();
if (ret) { if (ret) {
debug("spl_early_init() failed: %d\n", ret); debug("spl_early_init() failed: %d\n", ret);
@ -121,8 +114,13 @@ void board_init_f(ulong dummy)
* driver, which tries to DMA from/to the stack (likely) * driver, which tries to DMA from/to the stack (likely)
* located in this range. * located in this range.
*/ */
rk_clrsetreg(SGRF_DDR_RGN_CON16, 0x1FF, 0); sgrf = syscon_get_first_range(ROCKCHIP_SYSCON_PMUSGRF);
rk_clrreg(SGRF_SLV_SECURE_CON4, 0x2000); rk_clrsetreg(&sgrf->ddr_rgn_con[16], 0x1ff, 0);
rk_clrreg(&sgrf->slv_secure_con4, 0x2000);
/* eMMC clock generator: disable the clock multipilier */
grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
rk_clrreg(&grf->emmccore_con[11], 0x0ff);
secure_timer_init(); secure_timer_init();