rockchip: rk3399-puma: set gpio4cd iodomain to 1.8V

[u-boot] / 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 7f2dd65d446ac75ce39a5105733106f285a66651..c6690fa06900844439589a74a3c1a71e4d1b4181 100644 (file)
--- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c
+++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c
@@ -8,10 +8,17 @@
 #include <dm.h>
 #include <misc.h>
 #include <spl.h>
+#include <syscon.h>
 #include <usb.h>
 #include <dm/pinctrl.h>
 #include <dm/uclass-internal.h>
+#include <asm/io.h>
+#include <asm/gpio.h>
 #include <asm/setup.h>
+#include <asm/arch/clock.h>
+#include <asm/arch/cru_rk3399.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/grf_rk3399.h>
 #include <asm/arch/periph.h>
 #include <power/regulator.h>
 #include <u-boot/sha256.h>
@@ -33,9 +40,50 @@ 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
@@ -129,17 +177,32 @@ static void setup_serial(void)
 
        serialno = crc32_no_comp(0, low, 8);
        serialno |= (u64)crc32_no_comp(serialno, high, 8) << 32;
-       snprintf(serialno_str, sizeof(serialno_str), "%llx", serialno);
+       snprintf(serialno_str, sizeof(serialno_str), "%016llx", serialno);
 
        env_set("cpuid#", cpuid_str);
        env_set("serial#", serialno_str);
 #endif
 }
 
+static void setup_iodomain(void)
+{
+       const u32 GRF_IO_VSEL_GPIO4CD_SHIFT = 3;
+       struct rk3399_grf_regs *grf =
+           syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+
+       /*
+        * Set bit 3 in GRF_IO_VSEL so PCIE_RST# works (pin GPIO4_C6).
+        * Linux assumes that PCIE_RST# works out of the box as it probes
+        * PCIe before loading the iodomain driver.
+        */
+       rk_setreg(&grf->io_vsel, 1 << GRF_IO_VSEL_GPIO4CD_SHIFT);
+}
+
 int misc_init_r(void)
 {
        setup_serial();
        setup_macaddr();
+       setup_iodomain();
 
        return 0;
 }