driver: net: fsl-mc: Update fsl_mc_ldpaa_exit() path

[u-boot] / drivers / sysreset / sysreset_rk3188.c

diff --git a/drivers/sysreset/sysreset_rk3188.c b/drivers/sysreset/sysreset_rk3188.c
index 36ae47600a535c77636a9685315349003f13d8fe..053a6344f5325fd4de658e7ca82be036f7fb2776 100644 (file)
--- a/drivers/sysreset/sysreset_rk3188.c
+++ b/drivers/sysreset/sysreset_rk3188.c
@@ -7,21 +7,36 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <syscon.h>
 #include <sysreset.h>
 #include <asm/io.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/cru_rk3188.h>
+#include <asm/arch/grf_rk3188.h>
 #include <asm/arch/hardware.h>
 #include <linux/err.h>
 
 int rk3188_sysreset_request(struct udevice *dev, enum sysreset_t type)
 {
        struct rk3188_cru *cru = rockchip_get_cru();
+       struct rk3188_grf *grf;
 
        if (IS_ERR(cru))
                return PTR_ERR(cru);
        switch (type) {
        case SYSRESET_WARM:
+               grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
+               if (IS_ERR(grf))
+                       return -EPROTONOSUPPORT;
+
+               /*
+                * warm-reset keeps the remap value,
+                * so make sure it's disabled.
+                */
+               rk_clrsetreg(&grf->soc_con0,
+                       NOC_REMAP_MASK << NOC_REMAP_SHIFT,
+                       0 << NOC_REMAP_SHIFT);
+
                rk_clrreg(&cru->cru_mode_con, 0xffff);
                writel(0xeca8, &cru->cru_glb_srst_snd_value);
                break;