From 37cd4aea0d044636f0bb2f118d33b600df77ac40 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Mon, 21 Feb 2011 14:28:02 +0100 Subject: [PATCH] --- yaml --- r: 234159 b: refs/heads/master c: 9ced975711d605d7deb27ef027e0f9816a51b479 h: refs/heads/master i: 234157: 8b77d6d7c5a946882e318b00c72ed8d8cb777e33 234155: 4e5a3dec5a1e5002f92e7e049986d67055361177 234151: ecb1643636b234b37270a9928bcb1cef9d1c2ecc 234143: 292e67dc45ef43003cdab2c4bda640fcbda8a143 v: v3 --- [refs] | 2 +- trunk/arch/mips/alchemy/mtx-1/board_setup.c | 4 ++-- trunk/arch/mips/alchemy/xxs1500/board_setup.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 02b6d3e2917b..4f8b311d27cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf3a1eb85967dcbaae42f4fcb53c2392cec32677 +refs/heads/master: 9ced975711d605d7deb27ef027e0f9816a51b479 diff --git a/trunk/arch/mips/alchemy/mtx-1/board_setup.c b/trunk/arch/mips/alchemy/mtx-1/board_setup.c index 6398fa95905c..40b84b991191 100644 --- a/trunk/arch/mips/alchemy/mtx-1/board_setup.c +++ b/trunk/arch/mips/alchemy/mtx-1/board_setup.c @@ -54,8 +54,8 @@ int mtx1_pci_idsel(unsigned int devsel, int assert); static void mtx1_reset(char *c) { - /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ - au_writel(0x00000000, 0xAE00001C); + /* Jump to the reset vector */ + __asm__ __volatile__("jr\t%0"::"r"(0xbfc00000)); } static void mtx1_power_off(void) diff --git a/trunk/arch/mips/alchemy/xxs1500/board_setup.c b/trunk/arch/mips/alchemy/xxs1500/board_setup.c index b43c918925d3..80c521e5290d 100644 --- a/trunk/arch/mips/alchemy/xxs1500/board_setup.c +++ b/trunk/arch/mips/alchemy/xxs1500/board_setup.c @@ -36,8 +36,8 @@ static void xxs1500_reset(char *c) { - /* Hit BCSR.SYSTEM_CONTROL[SW_RST] */ - au_writel(0x00000000, 0xAE00001C); + /* Jump to the reset vector */ + __asm__ __volatile__("jr\t%0"::"r"(0xbfc00000)); } static void xxs1500_power_off(void)