rockchip: rk3399: Support common spl_board_init

[project/bcm63xx/u-boot.git] / board / theobroma-systems / puma_rk3399 / puma-rk3399.c

diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
index c6b509c109c560b9c65483c41e34f0fbe05e94de..251cd2d5667376340f772327a341b8f12487473a 100644 (file)
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -13,10 +13,8 @@
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
 #include <asm/io.h>
-#include <asm/gpio.h>
 #include <asm/setup.h>
 #include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru_rk3399.h>
 #include <asm/arch-rockchip/hardware.h>
 #include <asm/arch-rockchip/grf_rk3399.h>
 #include <asm/arch-rockchip/periph.h>
@@ -38,62 +36,6 @@ int board_init(void)
        return 0;
 }
 
-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);
-}
-
-void spl_board_init(void)
-{
-       int  ret;
-       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();
-
-       /*
-        * Turning the eMMC and SPI back on (if disabled via the Qseven
-        * BIOS_ENABLE) signal is done through a always-on regulator).
-        */
-       ret = regulators_enable_boot_on(false);
-       if (ret)
-               debug("%s: Cannot enable boot on regulator\n", __func__);
-
-       preloader_console_init();
-}
-
 static void setup_macaddr(void)
 {
 #if CONFIG_IS_ENABLED(CMD_NET)