minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-15 06:55:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

ppc: Move reset_status to arch_global_data

Browse Source 
Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2012-12-13 20:48:56 +00:00 committed by Tom Rini
parent 1c356135fa
commit 3c4c308c00
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/cpu/mpc512x/cpu.c
View File

@ -69,7 +69,7 @@ int checkcpu (void)
printf ("at %s MHz, CSB at %s MHz (RSR=0x%04lx)\n", printf ("at %s MHz, CSB at %s MHz (RSR=0x%04lx)\n",
strmhz(buf1, clock), strmhz(buf1, clock),
strmhz(buf2, gd->arch.csb_clk), strmhz(buf2, gd->arch.csb_clk),
gd->reset_status & 0xffff); gd->arch.reset_status & 0xffff);
return 0; return 0;
} }

2
arch/powerpc/cpu/mpc512x/cpu_init.c
View File

@ -62,7 +62,7 @@ void cpu_init_f (volatile immap_t * im)
#endif #endif
/* RSR - Reset Status Register - clear all status */ /* RSR - Reset Status Register - clear all status */
gd->reset_status = im->reset.rsr; gd->arch.reset_status = im->reset.rsr;
out_be32(&im->reset.rsr, ~RSR_RES); out_be32(&im->reset.rsr, ~RSR_RES);
/* /*

4
arch/powerpc/cpu/mpc8260/cpu_init.c
View File

@ -120,7 +120,7 @@ void cpu_init_f (volatile immap_t * immr)
memset ((void *) gd, 0, sizeof (gd_t)); memset ((void *) gd, 0, sizeof (gd_t));
/* RSR - Reset Status Register - clear all status (5-4) */ /* RSR - Reset Status Register - clear all status (5-4) */
gd->reset_status = immr->im_clkrst.car_rsr; gd->arch.reset_status = immr->im_clkrst.car_rsr;
immr->im_clkrst.car_rsr = RSR_ALLBITS; immr->im_clkrst.car_rsr = RSR_ALLBITS;
/* RMR - Reset Mode Register - contains checkstop reset enable (5-5) */ /* RMR - Reset Mode Register - contains checkstop reset enable (5-5) */
@ -274,7 +274,7 @@ int prt_8260_rsr (void)
RSR_EHRS, "External Hard"} RSR_EHRS, "External Hard"}
}; };
static int n = sizeof bits / sizeof bits[0]; static int n = sizeof bits / sizeof bits[0];
ulong rsr = gd->reset_status; ulong rsr = gd->arch.reset_status;
int i; int i;
char *sep; char *sep;

4
arch/powerpc/cpu/mpc83xx/cpu_init.c
View File

@ -232,7 +232,7 @@ void cpu_init_f (volatile immap_t * im)
clrsetbits_be32(&im->clk.sccr, sccr_mask, sccr_val); clrsetbits_be32(&im->clk.sccr, sccr_mask, sccr_val);
/* RSR - Reset Status Register - clear all status (4.6.1.3) */ /* RSR - Reset Status Register - clear all status (4.6.1.3) */
gd->reset_status = __raw_readl(&im->reset.rsr); gd->arch.reset_status = __raw_readl(&im->reset.rsr);
__raw_writel(~(RSR_RES), &im->reset.rsr); __raw_writel(~(RSR_RES), &im->reset.rsr);
/* AER - Arbiter Event Register - store status */ /* AER - Arbiter Event Register - store status */
@ -499,7 +499,7 @@ int prt_83xx_rsr(void)
RSR_HRS, "External/Internal Hard"} RSR_HRS, "External/Internal Hard"}
}; };
static int n = sizeof bits / sizeof bits[0]; static int n = sizeof bits / sizeof bits[0];
ulong rsr = gd->reset_status; ulong rsr = gd->arch.reset_status;
int i; int i;
char *sep; char *sep;

2
arch/powerpc/include/asm/global_data.h
View File

@ -107,6 +107,7 @@ struct arch_global_data {
unsigned long pev_clk; unsigned long pev_clk;
unsigned long flb_clk; unsigned long flb_clk;
#endif #endif
unsigned long reset_status; /* reset status register at boot */
}; };
/* /*
@ -130,7 +131,6 @@ typedef struct global_data {
u32 sdhc_clk; u32 sdhc_clk;
#endif #endif
phys_size_t ram_size; /* RAM size */ phys_size_t ram_size; /* RAM size */
unsigned long reset_status; /* reset status register at boot */
#if defined(CONFIG_MPC83xx) #if defined(CONFIG_MPC83xx)
unsigned long arbiter_event_attributes; unsigned long arbiter_event_attributes;
unsigned long arbiter_event_address; unsigned long arbiter_event_address;