Merge branch 'master' of git://git.denx.de/u-boot-rockchip

[oweals/u-boot.git] / arch / arm / mach-rockchip / rk3188-board.c

diff --git a/arch/arm/mach-rockchip/rk3188-board.c b/arch/arm/mach-rockchip/rk3188-board.c
index 16f38559afff430d6135419890d1c09b20d0e176..3e76100ad1e541a436330f30b331a6b172a8e9bf 100644 (file)
--- a/arch/arm/mach-rockchip/rk3188-board.c
+++ b/arch/arm/mach-rockchip/rk3188-board.c
@@ -11,6 +11,7 @@
 #include <syscon.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
+#include <asm/arch/grf_rk3188.h>
 #include <asm/arch/periph.h>
 #include <asm/arch/pmu_rk3288.h>
 #include <asm/arch/boot_mode.h>
@@ -19,6 +20,23 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+int board_late_init(void)
+{
+       struct rk3188_grf *grf;
+
+       grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+       if (IS_ERR(grf)) {
+               error("grf syscon returned %ld\n", PTR_ERR(grf));
+       } else {
+               /* 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;
+}
+
 int board_init(void)
 {
 #if defined(CONFIG_ROCKCHIP_SPL_BACK_TO_BROM)
@@ -54,14 +72,6 @@ err:
 #endif
 }
 
-int dram_init(void)
-{
-       /* FIXME: read back ram size from sys_reg2 */
-       gd->ram_size = 0x40000000;
-
-       return 0;
-}
-
 #ifndef CONFIG_SYS_DCACHE_OFF
 void enable_caches(void)
 {