aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9
diff options
context:
space:
mode:
authorAtsushi Nemoto <anemo@mba.ocn.ne.jp>2008-08-19 09:55:13 -0400
committerRalf Baechle <ralf@linux-mips.org>2008-10-11 11:18:43 -0400
commite6332374770ae5aa370af5792115261edbad05c1 (patch)
tree5b20a0ec756d4e8e09b26efd256245141921d293 /arch/mips/txx9
parent74894363499942a76f2c20e41e8bfebc9fdc267a (diff)
MIPS: RBTX4938: Add TOSHIBA_RBTX4938_MPLEX_KEEP
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>
Diffstat (limited to 'arch/mips/txx9')
-rw-r--r--arch/mips/txx9/Kconfig2
-rw-r--r--arch/mips/txx9/rbtx4938/setup.c13
2 files changed, 12 insertions, 3 deletions
diff --git a/arch/mips/txx9/Kconfig b/arch/mips/txx9/Kconfig
index 6fb2ef09d5dd..aade3348af29 100644
--- a/arch/mips/txx9/Kconfig
+++ b/arch/mips/txx9/Kconfig
@@ -94,6 +94,8 @@ config TOSHIBA_RBTX4938_MPLEX_NAND
94 bool "NAND" 94 bool "NAND"
95config TOSHIBA_RBTX4938_MPLEX_ATA 95config TOSHIBA_RBTX4938_MPLEX_ATA
96 bool "ATA" 96 bool "ATA"
97config TOSHIBA_RBTX4938_MPLEX_KEEP
98 bool "Keep firmware settings"
97 99
98endchoice 100endchoice
99 101
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index e7bc5b8c7db8..7aba92a12399 100644
--- 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)
174#endif 174#endif
175 175
176#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61 176#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61
177 printk(KERN_INFO "PIOSEL: disabling both ata and nand selection\n"); 177 pr_info("PIOSEL: disabling both ATA and NAND selection\n");
178 txx9_clear64(&tx4938_ccfgptr->pcfg, 178 txx9_clear64(&tx4938_ccfgptr->pcfg,
179 TX4938_PCFG_NDF_SEL | TX4938_PCFG_ATA_SEL); 179 TX4938_PCFG_NDF_SEL | TX4938_PCFG_ATA_SEL);
180#endif 180#endif
181 181
182#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND 182#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_NAND
183 printk(KERN_INFO "PIOSEL: enabling nand selection\n"); 183 pr_info("PIOSEL: enabling NAND selection\n");
184 txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL); 184 txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL);
185 txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL); 185 txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL);
186#endif 186#endif
187 187
188#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA 188#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_ATA
189 printk(KERN_INFO "PIOSEL: enabling ata selection\n"); 189 pr_info("PIOSEL: enabling ATA selection\n");
190 txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL); 190 txx9_set64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_ATA_SEL);
191 txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL); 191 txx9_clear64(&tx4938_ccfgptr->pcfg, TX4938_PCFG_NDF_SEL);
192#endif 192#endif
193 193
194#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_KEEP
195 pcfg = ____raw_readq(&tx4938_ccfgptr->pcfg);
196 pr_info("PIOSEL: NAND %s, ATA %s\n",
197 (pcfg & TX4938_PCFG_NDF_SEL) ? "enabled" : "disabled",
198 (pcfg & TX4938_PCFG_ATA_SEL) ? "enabled" : "disabled");
199#endif
200
194 rbtx4938_spi_setup(); 201 rbtx4938_spi_setup();
195 pcfg = ____raw_readq(&tx4938_ccfgptr->pcfg); /* updated */ 202 pcfg = ____raw_readq(&tx4938_ccfgptr->pcfg); /* updated */
196 /* fixup piosel */ 203 /* fixup piosel */