From cf2efc5eff747525653ed05154bf5465e7f38d3f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 29 Nov 2005 16:01:32 +0000 Subject: [PATCH] --- yaml --- r: 14921 b: refs/heads/master c: dea91002d45e4f0fe83768703288e1cde917371c h: refs/heads/master i: 14919: 4a569ab9dc48c62c553b462e2717cb61527ecaf9 v: v3 --- [refs] | 2 +- trunk/arch/mips/au1000/db1x00/board_setup.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index f749687a5003..29f54104da0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: edcb98d1db7d0320d7b1920c05a4f1cafe7cb798 +refs/heads/master: dea91002d45e4f0fe83768703288e1cde917371c diff --git a/trunk/arch/mips/au1000/db1x00/board_setup.c b/trunk/arch/mips/au1000/db1x00/board_setup.c index ac05ba0ff63f..f00ec3b175d8 100644 --- a/trunk/arch/mips/au1000/db1x00/board_setup.c +++ b/trunk/arch/mips/au1000/db1x00/board_setup.c @@ -45,13 +45,12 @@ #include #include -/* 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) @@ -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 */