Skip to content

Commit

Permalink
[MIPS] Alchemy: Fix BCSR accesses.
Browse files Browse the repository at this point in the history
    
Fixes BCSR accesses in the board setup/reset code.  The registers are
actually 16-bit, and their addresses are different between DBAu1550 and
other DBAu1xx0 boards.
    
From Sergei Shtylylov <sshtylyov@ru.mvista.com>.
    
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Dec 1, 2005
1 parent edcb98d commit dea9100
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions arch/mips/au1000/db1x00/board_setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,12 @@
#include <asm/mach-au1x00/au1000.h>
#include <asm/mach-db1x00/db1x00.h>

/* not correct for db1550 */
static BCSR * const bcsr = (BCSR *)0xAE000000;
static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;

void board_reset (void)
{
/* Hit BCSR.SYSTEM_CONTROL[SW_RST] */
au_writel(0x00000000, 0xAE00001C);
bcsr->swreset = 0x0000;
}

void __init board_setup(void)
Expand All @@ -75,7 +74,7 @@ void __init board_setup(void)
bcsr->resets |= BCSR_RESETS_IRDA_MODE_OFF;
au_sync();
#endif
au_writel(0, 0xAE000010); /* turn off pcmcia power */
bcsr->pcmcia = 0x0000; /* turn off PCMCIA power */

#ifdef CONFIG_MIPS_MIRAGE
/* enable GPIO[31:0] inputs */
Expand Down

0 comments on commit dea9100

Please sign in to comment.