From b99c480fd7be0ee9a56254a34b8dc516f2943783 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Mon, 20 Mar 2006 11:58:02 -0600 Subject: [PATCH] --- yaml --- r: 22943 b: refs/heads/master c: 1a02e59a2970f9ed28ab51d3b08624b79e54d848 h: refs/heads/master i: 22941: e67858b1fcca5d5b2292f542537fa61c16a282ca 22939: 86a17601152ae013687413db92bd280dfbeae413 22935: 4f61f3425e515dc9dc818c480ee1410cacd73042 22927: 4e81a320be22f448f1a3149f66358b31b21b6340 22911: 9e447b0c43cb747d753a39de11a0b49dc4a9f7a3 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/83xx/misc.c | 2 +- trunk/arch/ppc/platforms/83xx/mpc834x_sys.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 44750996b17f..163fa1afed47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2c276603c3e5ebf38155a9d1fbbda656d52d138e +refs/heads/master: 1a02e59a2970f9ed28ab51d3b08624b79e54d848 diff --git a/trunk/arch/powerpc/platforms/83xx/misc.c b/trunk/arch/powerpc/platforms/83xx/misc.c index 0eb3d99f1b93..1455bcef4892 100644 --- a/trunk/arch/powerpc/platforms/83xx/misc.c +++ b/trunk/arch/powerpc/platforms/83xx/misc.c @@ -35,7 +35,7 @@ void mpc83xx_restart(char *cmd) 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 (;;) ; } diff --git a/trunk/arch/ppc/platforms/83xx/mpc834x_sys.h b/trunk/arch/ppc/platforms/83xx/mpc834x_sys.h index aa86c22cdd25..6727bbdc36ec 100644 --- a/trunk/arch/ppc/platforms/83xx/mpc834x_sys.h +++ b/trunk/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