[PATCH 1/3] Revert "rockchip: rk3399: Drop unneeded bob and kevin board specific code"

[Jonas Karlman]

These power rails must be on very early for the U-Boos SPL banner to be
show over debug UART.

This reverts commit af518a1dfe637cb4dc486d7a832585e4a48bc970.

Signed-off-by: Jonas Karlman <jo...@kwiboo.se>
---
 arch/arm/mach-rockchip/rk3399/rk3399.c | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c 
b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 1ce43c6f0d40..ba89079b1e73 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -7,6 +7,7 @@
 #include <init.h>
 #include <log.h>
 #include <spl.h>
+#include <spl_gpio.h>
 #include <syscon.h>
 #include <asm/armv8/mmu.h>
 #include <asm/arch-rockchip/bootrom.h>
@@ -15,7 +16,6 @@
 #include <asm/arch-rockchip/gpio.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
-#include <asm/gpio.h>
 #include <linux/bitops.h>
 #include <linux/printk.h>
 #include <power/regulator.h>
@@ -133,6 +133,27 @@ void board_debug_uart_init(void)
                     GRF_GPIO3B7_SEL_MASK,
                     GRF_UART3_SOUT << GRF_GPIO3B7_SEL_SHIFT);
 #else
+       struct rk3399_pmugrf_regs * const pmugrf = (void *)PMUGRF_BASE;
+       struct rockchip_gpio_regs * const gpio = (void *)GPIO0_BASE;
+
+       if (IS_ENABLED(CONFIG_SPL_BUILD) &&
+           (IS_ENABLED(CONFIG_TARGET_CHROMEBOOK_BOB) ||
+            IS_ENABLED(CONFIG_TARGET_CHROMEBOOK_KEVIN))) {
+               rk_setreg(&grf->io_vsel, 1 << 0);
+
+               /*
+                * Let's enable these power rails here, we are already running
+                * the SPI-Flash-based code.
+                */
+               spl_gpio_output(gpio, GPIO(BANK_B, 2), 1);  /* PP1500_EN */
+               spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_B, 2),
+                                 GPIO_PULL_NORMAL);
+
+               spl_gpio_output(gpio, GPIO(BANK_B, 4), 1);  /* PP3000_EN */
+               spl_gpio_set_pull(&pmugrf->gpio0_p, GPIO(BANK_B, 4),
+                                 GPIO_PULL_NORMAL);
+       }
+
        /* Enable early UART2 channel C on the RK3399 */
        rk_clrsetreg(&grf->gpio4c_iomux,
                     GRF_GPIO4C3_SEL_MASK,
-- 
2.48.1