From 97f65a9ef2ab90eb957ab83d3997a19e450a04a2 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Wed, 22 Mar 2006 13:46:53 +1100 Subject: [PATCH] --- yaml --- r: 22947 b: refs/heads/master c: 1d7aac5b3bce34c8b5fcec8ca577a4d3af880fd3 h: refs/heads/master i: 22945: 9959961966d728cf94e4d9c8be5ac66b52197a20 22943: b99c480fd7be0ee9a56254a34b8dc516f2943783 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 a9e7910a95c1..c171406afbbe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61c5504a0ed66c8b460f9a006eedaea2ee587e33 +refs/heads/master: 1d7aac5b3bce34c8b5fcec8ca577a4d3af880fd3 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