diff options
| author | Detlev Zundel <dzu@denx.de> | 2010-01-21 16:55:58 (GMT) |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-01-21 22:00:45 (GMT) |
| commit | 57ae8a5cced612088104303777e71a3dc89c00ef (patch) | |
| tree | 027b189cfced7e64b3e8f7e09d204cd27294a710 /cpu/mpc512x/cpu.c | |
| parent | c7c0d542a199089cf658a7c23c314a5cff248b00 (diff) | |
| download | u-boot-fsl-qoriq-57ae8a5cced612088104303777e71a3dc89c00ef.tar.xz | |
mpc512x: Use in/out accessors for all registers
This is not only a cosmetic change as it fixes the real bug of board
reset not working with the ELDK 4.2 toolchain.
Signed-off-by: Detlev Zundel <dzu@denx.de>
Diffstat (limited to 'cpu/mpc512x/cpu.c')
| -rw-r--r-- | cpu/mpc512x/cpu.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c index dac48db..f96a4c8 100644 --- a/cpu/mpc512x/cpu.c +++ b/cpu/mpc512x/cpu.c @@ -1,6 +1,6 @@ /* + * (C) Copyright 2007-2010 DENX Software Engineering * Copyright (C) 2004-2006 Freescale Semiconductor, Inc. - * (C) Copyright 2007 DENX Software Engineering * * See file CREDITS for list of people who contributed to this * project. @@ -32,6 +32,7 @@ #include <net.h> #include <netdev.h> #include <asm/processor.h> +#include <asm/io.h> #if defined(CONFIG_OF_LIBFDT) #include <fdt_support.h> @@ -44,7 +45,7 @@ int checkcpu (void) volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; ulong clock = gd->cpu_clk; u32 pvr = get_pvr (); - u32 spridr = immr->sysconf.spridr; + u32 spridr = in_be32(&immr->sysconf.spridr); char buf1[32], buf2[32]; puts ("CPU: "); @@ -87,17 +88,17 @@ do_reset (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) /* * Enable Reset Control Reg - "RSTE" is the magic word that let us go */ - immap->reset.rpr = 0x52535445; + out_be32(&immap->reset.rpr, 0x52535445); /* Verify Reset Control Reg is enabled */ - while (!((immap->reset.rcer) & RCER_CRE)) + while (!(in_be32(&immap->reset.rcer) & RCER_CRE)) ; printf ("Resetting the board.\n"); udelay(200); /* Perform reset */ - immap->reset.rcr = RCR_SWHR; + out_be32(&immap->reset.rcr, RCR_SWHR); /* Unreached... */ return 1; @@ -124,8 +125,8 @@ void watchdog_reset (void) /* Reset watchdog */ volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR; - immr->wdt.swsrr = 0x556c; - immr->wdt.swsrr = 0xaa39; + out_be32(&immr->wdt.swsrr, 0x556c); + out_be32(&immr->wdt.swsrr, 0xaa39); if (re_enable) enable_interrupts (); |