commit 1a02e59a2970f9ed28ab51d3b08624b79e54d848
author Kumar Gala <galak@kernel.crashing.org> Mon Mar 20 11:58:02 2006 -0600
committer Kumar Gala <galak@kernel.crashing.org> Mon Mar 20 11:58:02 2006 -0600
tree 470cce472be3b08c160e0c569648e7228651b12a
parent ebcff3c773b42bce6182ec16485abca4e53fba97
parent 2c276603c3e5ebf38155a9d1fbbda656d52d138e

Merge branch 'master'

arch/powerpc/platforms/83xx/misc.c

diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c
index 0eb3d99..1455bce 100644
--- a/arch/powerpc/platforms/83xx/misc.c
+++ b/arch/powerpc/platforms/83xx/misc.c
@@ -35,7 +35,7 @@
 	out_be32(reg + (RST_PROT_REG >> 2), 0x52535445);
 
 	/* set software hard reset */
-	out_be32(reg + (RST_CTRL_REG >> 2), 0x52535445);
+	out_be32(reg + (RST_CTRL_REG >> 2), 0x2);
 	for (;;) ;
 }
 

arch/ppc/platforms/83xx/mpc834x_sys.h

diff --git a/arch/ppc/platforms/83xx/mpc834x_sys.h b/arch/ppc/platforms/83xx/mpc834x_sys.h
index aa86c22..6727bbd 100644
--- a/arch/ppc/platforms/83xx/mpc834x_sys.h
+++ b/arch/ppc/platforms/83xx/mpc834x_sys.h
@@ -23,7 +23,7 @@
 #define VIRT_IMMRBAR		((uint)0xfe000000)
 
 #define BCSR_PHYS_ADDR		((uint)0xf8000000)
-#define BCSR_SIZE		((uint)(128 * 1024))
+#define BCSR_SIZE		((uint)(32 * 1024))
 
 #define BCSR_MISC_REG2_OFF	0x07
 #define BCSR_MISC_REG2_PORESET	0x01