]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
MIPS: RBTX4939: Fix IOC pin-enable register updating
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Wed, 15 Jul 2009 13:03:56 +0000 (22:03 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 3 Aug 2009 16:52:44 +0000 (17:52 +0100)
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>
arch/mips/txx9/rbtx4939/setup.c

index c033ffe71cdfc0e35c1fbd64323ebe54293ae94a..b0c241ecf603c3549a98b385176ad701eb7532c6 100644 (file)
@@ -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;