diff mbox

[U-Boot,v3,02/10] MIPS: qemu-malta: add reset support

Message ID 1369231066-15372-3-git-send-email-juhosg@openwrt.org
State Accepted
Delegated to: Daniel Schwierzeck
Headers show

Commit Message

Gabor Juhos May 22, 2013, 1:57 p.m. UTC 
The MIPS Malta board has a SOFTRES register. Writing a
magic value into that register initiates a board reset.

Use this feature to implement reset support.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Cc: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
---
Changes since v2:
 - don't use le32_to_cpu accessor, it is not needed because
   the __raw_* IO accessors has been fixed mainline
 - rebased against the master branch of git.denx.de/u-boot.git

Changes since v1:
 - rebased against mips/testing

Changes since RFC: ---

Screenshot:

  U-Boot 2013.04-00238-g0320f0c (May 21 2013 - 22:31:20)

  Board: MIPS Malta CoreLV (Qemu)
  DRAM:  256 MiB
  Using default environment

  In:    serial
  Out:   serial
  Err:   serial
  qemu-malta # reset

  U-Boot 2013.04-00238-g0320f0c (May 21 2013 - 22:31:20)

  Board: MIPS Malta CoreLV (Qemu)
  DRAM:  256 MiB
  Using default environment

  In:    serial
  Out:   serial
  Err:   serial
  qemu-malta #
---
 arch/mips/include/asm/malta.h |    3 +++
 board/qemu-malta/qemu-malta.c |   11 +++++++++++
 2 files changed, 14 insertions(+)
diff mbox

Patch

diff --git a/arch/mips/include/asm/malta.h b/arch/mips/include/asm/malta.h
index b215164..f2bbf0f 100644
--- a/arch/mips/include/asm/malta.h
+++ b/arch/mips/include/asm/malta.h
@@ -13,4 +13,7 @@ 
 
 #define MALTA_UART_BASE		(MALTA_IO_PORT_BASE + 0x3f8)
 
+#define MALTA_RESET_BASE	0x1f000500
+#define GORESET			0x42
+
 #endif /* _MIPS_ASM_MALTA_H */
diff --git a/board/qemu-malta/qemu-malta.c b/board/qemu-malta/qemu-malta.c
index 9ba711d..449da9c 100644
--- a/board/qemu-malta/qemu-malta.c
+++ b/board/qemu-malta/qemu-malta.c
@@ -8,6 +8,9 @@ 
 
 #include <common.h>
 
+#include <asm/io.h>
+#include <asm/malta.h>
+
 phys_size_t initdram(int board_type)
 {
 	return CONFIG_SYS_MEM_SIZE;
@@ -18,3 +21,11 @@  int checkboard(void)
 	puts("Board: MIPS Malta CoreLV (Qemu)\n");
 	return 0;
 }
+
+void _machine_restart(void)
+{
+	void __iomem *reset_base;
+
+	reset_base = (void __iomem *)CKSEG1ADDR(MALTA_RESET_BASE);
+	__raw_writel(GORESET, reset_base);
+}