]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
MIPS: RBTX4938: Add TOSHIBA_RBTX4938_MPLEX_KEEP
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Tue, 19 Aug 2008 13:55:13 +0000 (22:55 +0900)
committerRalf Baechle <ralf@linux-mips.org>
Sat, 11 Oct 2008 15:18:43 +0000 (16:18 +0100)
Add TOSHIBA_RBTX4938_MPLEX_KEEP to keep MPLEX settings by firmware.
Also replace some printk with pr_info.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/txx9/Kconfig
arch/mips/txx9/rbtx4938/setup.c

index 6fb2ef09d5dd858ed428a04835776cc3d3b87d05..aade3348af294f58bc2ddc1abdfe942cf2388e2e 100644 (file)
@@ -94,6 +94,8 @@ config TOSHIBA_RBTX4938_MPLEX_NAND
        bool "NAND"
 config TOSHIBA_RBTX4938_MPLEX_ATA
        bool "ATA"
+config TOSHIBA_RBTX4938_MPLEX_KEEP
+       bool "Keep firmware settings"
 
 endchoice
 
index e7bc5b8c7db8640d189f7328a51268b1de2fc47b..7aba92a123992a9c45339840efef2ea6cfd29fbc 100644 (file)
@@ -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 */