summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2009-07-15 22:03:56 +0900
committerRalf Baechle <ralf@linux-mips.org>2009-08-03 17:52:44 +0100
commit3e6e92183118d26d856e8efb549987164d1b49b4 (patch)
treeeb5a52a3846f4168fd8459dd753ae6a6bc65faa5
parent0ca71737fee65521ede964afbd2d5484976ed0ed (diff)
downloadlinux-3.10-3e6e92183118d26d856e8efb549987164d1b49b4.tar.gz
linux-3.10-3e6e92183118d26d856e8efb549987164d1b49b4.tar.bz2
linux-3.10-3e6e92183118d26d856e8efb549987164d1b49b4.zip
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>
-rw-r--r--arch/mips/txx9/rbtx4939/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/txx9/rbtx4939/setup.c b/arch/mips/txx9/rbtx4939/setup.c
index c033ffe71cd..b0c241ecf60 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)
rbtx4939_ebusc_setup();
/* always enable ATA0 */
txx9_set64(&tx4939_ccfgptr->pcfg, TX4939_PCFG_ATA0MODE);
- rbtx4939_update_ioc_pen();
if (txx9_master_clock == 0)
txx9_master_clock = 20000000;
tx4939_setup();
+ rbtx4939_update_ioc_pen();
#ifdef HAVE_RBTX4939_IOSWAB
ioswabw = rbtx4939_ioswabw;
__mem_ioswabw = rbtx4939_mem_ioswabw;