diff options
author | Atsushi Nemoto <anemo@mba.ocn.ne.jp> | 2009-07-15 09:03:56 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-08-03 12:52:44 -0400 |
commit | 3e6e92183118d26d856e8efb549987164d1b49b4 (patch) | |
tree | eb5a52a3846f4168fd8459dd753ae6a6bc65faa5 /arch | |
parent | 0ca71737fee65521ede964afbd2d5484976ed0ed (diff) |
MIPS: RBTX4939: Fix IOC pin-enable register updating
The rbtx4939_update_ioc_pen() expects txx9_ce_res[] already initialized.
Call it after tx4939_setup().
Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/txx9/rbtx4939/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c index c033ffe71cdf..b0c241ecf603 100644 --- a/arch/mips/txx9/rbtx4939/setup.c +++ b/arch/mips/txx9/rbtx4939/setup.c | |||
@@ -512,10 +512,10 @@ static void __init rbtx4939_setup(void) | |||
512 | rbtx4939_ebusc_setup(); | 512 | rbtx4939_ebusc_setup(); |
513 | /* always enable ATA0 */ | 513 | /* always enable ATA0 */ |
514 | txx9_set64(&tx4939_ccfgptr->pcfg, TX4939_PCFG_ATA0MODE); | 514 | txx9_set64(&tx4939_ccfgptr->pcfg, TX4939_PCFG_ATA0MODE); |
515 | rbtx4939_update_ioc_pen(); | ||
516 | if (txx9_master_clock == 0) | 515 | if (txx9_master_clock == 0) |
517 | txx9_master_clock = 20000000; | 516 | txx9_master_clock = 20000000; |
518 | tx4939_setup(); | 517 | tx4939_setup(); |
518 | rbtx4939_update_ioc_pen(); | ||
519 | #ifdef HAVE_RBTX4939_IOSWAB | 519 | #ifdef HAVE_RBTX4939_IOSWAB |
520 | ioswabw = rbtx4939_ioswabw; | 520 | ioswabw = rbtx4939_ioswabw; |
521 | __mem_ioswabw = rbtx4939_mem_ioswabw; | 521 | __mem_ioswabw = rbtx4939_mem_ioswabw; |