diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-28 10:12:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-28 10:12:07 -0400 |
| commit | 5f99ba1e24693eb881c2eb673f78ee241056f825 (patch) | |
| tree | 7268ce7d4ac54313cf05d7136a76653464cd58d2 /arch | |
| parent | 04983e936cf5096ca37ed88df0a3dfbafdc8da14 (diff) | |
| parent | 673eb44e91bc0c06cb1e3f353f5d07b4f9e5a586 (diff) | |
Merge tag 'u-boot-rockchip-20200628' of https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip
- rk3188 cpu init and APLL fix;
- rk3399: Add BOOTENV_SF command;
- rk3288 correct vop0 vop1 setting;
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-rockchip/rk3188/rk3188.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/rk3188/rk3188.c b/arch/arm/mach-rockchip/rk3188/rk3188.c index ef57dfd7619..1b2f4a47571 100644 --- a/arch/arm/mach-rockchip/rk3188/rk3188.c +++ b/arch/arm/mach-rockchip/rk3188/rk3188.c @@ -77,15 +77,32 @@ int arch_cpu_init(void) BYPASSSEL_MASK | BYPASSDMEN_MASK, 1 << BYPASSSEL_SHIFT | 1 << BYPASSDMEN_SHIFT); #endif + return 0; +} +#endif + +__weak int rk3188_board_late_init(void) +{ + return 0; +} + +int rk_board_late_init(void) +{ + struct rk3188_grf *grf; + + grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); + if (IS_ERR(grf)) { + pr_err("grf syscon returned %ld\n", PTR_ERR(grf)); + return 0; + } /* enable noc remap to mimic legacy loaders */ rk_clrsetreg(&grf->soc_con0, NOC_REMAP_MASK << NOC_REMAP_SHIFT, NOC_REMAP_MASK << NOC_REMAP_SHIFT); - return 0; + return rk3188_board_late_init(); } -#endif #ifdef CONFIG_SPL_BUILD static int setup_led(void) |