git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[pandora-kernel.git]
/
arch
/
mips
/
alchemy
/
mtx-1
/
board_setup.c
diff --git
a/arch/mips/alchemy/mtx-1/board_setup.c
b/arch/mips/alchemy/mtx-1/board_setup.c
index
6398fa9
..
40b84b9
100644
(file)
--- a/
arch/mips/alchemy/mtx-1/board_setup.c
+++ b/
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)