rockchip: rk3399: Support common spl_board_init

[project/bcm63xx/u-boot.git] / arch / arm / mach-rockchip / rk3399-board-spl.c

diff --git a/arch/arm/mach-rockchip/rk3399-board-spl.c b/arch/arm/mach-rockchip/rk3399-board-spl.c
index 800ca800223b5c8a25374d165d6c4b9ffa289eb8..65c98b697dc47a8df048a5e0239b97a0b44c3a9e 100644 (file)
--- a/arch/arm/mach-rockchip/rk3399-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3399-board-spl.c
@@ -11,13 +11,16 @@
 #include <spl.h>
 #include <spl_gpio.h>
 #include <syscon.h>
+#include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch-rockchip/bootrom.h>
 #include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/cru_rk3399.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/periph.h>
 #include <asm/arch-rockchip/sys_proto.h>
+#include <power/regulator.h>
 #include <dm/pinctrl.h>
 
 void board_return_to_bootrom(void)
@@ -202,6 +205,66 @@ void board_init_f(ulong dummy)
        }
 }
 
+#if defined(SPL_GPIO_SUPPORT)
+static void rk3399_force_power_on_reset(void)
+{
+       ofnode node;
+       struct gpio_desc sysreset_gpio;
+
+       debug("%s: trying to force a power-on reset\n", __func__);
+
+       node = ofnode_path("/config");
+       if (!ofnode_valid(node)) {
+               debug("%s: no /config node?\n", __func__);
+               return;
+       }
+
+       if (gpio_request_by_name_nodev(node, "sysreset-gpio", 0,
+                                      &sysreset_gpio, GPIOD_IS_OUT)) {
+               debug("%s: could not find a /config/sysreset-gpio\n", __func__);
+               return;
+       }
+
+       dm_gpio_set_value(&sysreset_gpio, 1);
+}
+#endif
+
+void spl_board_init(void)
+{
+#if defined(SPL_GPIO_SUPPORT)
+       struct rk3399_cru *cru = rockchip_get_cru();
+
+       /*
+        * The RK3399 resets only 'almost all logic' (see also in the TRM
+        * "3.9.4 Global software reset"), when issuing a software reset.
+        * This may cause issues during boot-up for some configurations of
+        * the application software stack.
+        *
+        * To work around this, we test whether the last reset reason was
+        * a power-on reset and (if not) issue an overtemp-reset to reset
+        * the entire module.
+        *
+        * While this was previously fixed by modifying the various places
+        * that could generate a software reset (e.g. U-Boot's sysreset
+        * driver, the ATF or Linux), we now have it here to ensure that
+        * we no longer have to track this through the various components.
+        */
+       if (cru->glb_rst_st != 0)
+               rk3399_force_power_on_reset();
+#endif
+
+#if defined(SPL_DM_REGULATOR)
+       /*
+        * Turning the eMMC and SPI back on (if disabled via the Qseven
+        * BIOS_ENABLE) signal is done through a always-on regulator).
+        */
+       if (regulators_enable_boot_on(false))
+               debug("%s: Cannot enable boot on regulator\n", __func__);
+#endif
+
+       preloader_console_init();
+}
+
 #ifdef CONFIG_SPL_LOAD_FIT
 int board_fit_config_name_match(const char *name)
 {