ARM: dts: sama5d2: Add uart4 definition

[oweals/u-boot.git] / arch / arm / cpu / arm926ejs / lpc32xx / cpu.c

diff --git a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
index f75747407658354f84ec6e0ee4fa9db4f8832aeb..4c59a44f7e6c31d261fade7cae4a42d73b6e2692 100644 (file)
--- a/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
+++ b/arch/arm/cpu/arm926ejs/lpc32xx/cpu.c
@@ -1,10 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
- * Copyright (C) 2011 by Vladimir Zapolskiy <vz@mleia.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
+ * Copyright (C) 2011-2015 by Vladimir Zapolskiy <vz@mleia.com>
  */
 
 #include <common.h>
+#include <cpu_func.h>
 #include <netdev.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
@@ -20,12 +20,23 @@ void reset_cpu(ulong addr)
        /* Enable watchdog clock */
        setbits_le32(&clk->timclk_ctrl, CLK_TIMCLK_WATCHDOG);
 
-       /* Reset pulse length is 13005 peripheral clock frames */
-       writel(13000, &wdt->pulse);
+       /* To be compatible with the original U-Boot code:
+        * addr: - 0: perform hard reset.
+        *       - !=0: perform a soft reset; i.e. "RESOUT_N" not asserted). */
+       if (addr == 0) {
+               /* Reset pulse length is 13005 peripheral clock frames */
+               writel(13000, &wdt->pulse);
 
-       /* Force WDOG_RESET2 and RESOUT_N signal active */
-       writel(WDTIM_MCTRL_RESFRC2 | WDTIM_MCTRL_RESFRC1 | WDTIM_MCTRL_M_RES2,
-              &wdt->mctrl);
+               /* Force WDOG_RESET2 and RESOUT_N signal active */
+               writel(WDTIM_MCTRL_RESFRC2 | WDTIM_MCTRL_RESFRC1
+                      | WDTIM_MCTRL_M_RES2, &wdt->mctrl);
+       } else {
+               /* Force match output active */
+               writel(0x01, &wdt->emr);
+
+               /* Internal reset on match output (no pulse on "RESOUT_N") */
+               writel(WDTIM_MCTRL_M_RES1, &wdt->mctrl);
+       }
 
        while (1)
                /* NOP */;
@@ -35,7 +46,7 @@ void reset_cpu(ulong addr)
 int arch_cpu_init(void)
 {
        /*
-        * It might be necessary to flush data cache, if U-boot is loaded
+        * It might be necessary to flush data cache, if U-Boot is loaded
         * from kickstart bootloader, e.g. from S1L loader
         */
        flush_dcache_all();