1 files changed, 18 insertions, 3 deletions

diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index a725abc5a5..7941ca68a6 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -3,16 +3,31 @@
  * Copyright (c) 2016 Rockchip Electronics Co., Ltd
  */
 #include <asm/io.h>
-#include <asm/arch/hardware.h>
+#include <asm/arch-rockchip/hardware.h>
+#include <asm/arch-rockchip/grf_rk3288.h>
 
-#define GRF_SOC_CON2 0xff77024c
+#define GRF_BASE        0xff770000
 
 int arch_cpu_init(void)
 {
         /* We do some SoC one time setting here. */
+        struct rk3288_grf * const grf = (void *)GRF_BASE;
 
         /* Use rkpwm by default */
-        rk_setreg(GRF_SOC_CON2, 1 << 0);
+        rk_setreg(&grf->soc_con2, 1 << 0);
 
         return 0;
 }
+
+#ifdef CONFIG_DEBUG_UART_BOARD_INIT
+void board_debug_uart_init(void)
+{
+        /* Enable early UART on the RK3288 */
+        struct rk3288_grf * const grf = (void *)GRF_BASE;
+
+        rk_clrsetreg(&grf->gpio7ch_iomux, GPIO7C7_MASK << GPIO7C7_SHIFT |
+                     GPIO7C6_MASK << GPIO7C6_SHIFT,
+                     GPIO7C7_UART2DBG_SOUT << GPIO7C7_SHIFT |
+                     GPIO7C6_UART2DBG_SIN << GPIO7C6_SHIFT);
+}
+#endif