MIPS: RBTX4938: Add TOSHIBA_RBTX4938_MPLEX_KEEP

[linux-2.6-omap-h63xx.git] / arch / mips / txx9 / rbtx4938 / setup.c

diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index e7bc5b8c7db8640d189f7328a51268b1de2fc47b..7aba92a123992a9c45339840efef2ea6cfd29fbc 100644 (file)
--- a/arch/mips/txx9/rbtx4938/setup.c
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -174,23 +174,30 @@ static void __init rbtx4938_mem_setup(void)
 #endif
 
 #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61
-       printk(KERN_INFO "PIOSEL: disabling both ata and nand selection\n");
+       pr_info("PIOSEL: disabling both ATA and NAND selection\n");
        txx9_clear64(&tx4938_ccfgptr->pcfg,
                     TX4938_PCFG_NDF_SEL | TX4938_PCFG_ATA_SEL);
 #endif
 
 #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND
-       printk(KERN_INFO "PIOSEL: enabling nand selection\n");
+       pr_info("PIOSEL: enabling NAND selection\n");
        txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL);
        txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL);
 #endif
 
 #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA
-       printk(KERN_INFO "PIOSEL: enabling ata selection\n");
+       pr_info("PIOSEL: enabling ATA selection\n");
        txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL);
        txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL);
 #endif
 
+#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP
+       pcfg = ____raw_readq(&tx4938_ccfgptr->pcfg);
+       pr_info("PIOSEL: NAND %s, ATA %s\n",
+               (pcfg & TX4938_PCFG_NDF_SEL) ? "enabled" : "disabled",
+               (pcfg & TX4938_PCFG_ATA_SEL) ? "enabled" : "disabled");
+#endif
+
        rbtx4938_spi_setup();
        pcfg = ____raw_readq(&tx4938_ccfgptr->pcfg);    /* updated */
        /* fixup piosel */