aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/txx9/rbtx4938
diff options
context:
space:
mode:
authorYoichi Yuasa <yuasa@linux-mips.org>2010-02-02 04:40:04 -0500
committerRalf Baechle <ralf@linux-mips.org>2010-02-27 06:53:22 -0500
commitab4ba291683d07038c7ddf1eec191d3d09e1f468 (patch)
tree267b4cefdfe33510ffe9eb8ea15de8ef71bc089d /arch/mips/txx9/rbtx4938
parent7084338eb8eb0cc021ba86c340157bad397f3f0b (diff)
MIPS: TXx9: Remove forced serial console setting
It is not always used, even if it is available. Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org> Cc: linux-mips <linux-mips@linux-mips.org> Patchwork: http://patchwork.linux-mips.org/patch/933/ Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/txx9/rbtx4938')
-rw-r--r--arch/mips/txx9/rbtx4938/setup.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/txx9/rbtx4938/setup.c b/arch/mips/txx9/rbtx4938/setup.c
index d66509b14284..d6e70dab3bd3 100644
--- a/arch/mips/txx9/rbtx4938/setup.c
+++ b/arch/mips/txx9/rbtx4938/setup.c
@@ -153,7 +153,6 @@ static void __init rbtx4938_time_init(void)
153static void __init rbtx4938_mem_setup(void) 153static void __init rbtx4938_mem_setup(void)
154{ 154{
155 unsigned long long pcfg; 155 unsigned long long pcfg;
156 char *argptr;
157 156
158 if (txx9_master_clock == 0) 157 if (txx9_master_clock == 0)
159 txx9_master_clock = 25000000; /* 25MHz */ 158 txx9_master_clock = 25000000; /* 25MHz */
@@ -168,11 +167,6 @@ static void __init rbtx4938_mem_setup(void)
168#endif 167#endif
169 168
170 tx4938_sio_init(7372800, 0); 169 tx4938_sio_init(7372800, 0);
171#ifdef CONFIG_SERIAL_TXX9_CONSOLE
172 argptr = prom_getcmdline();
173 if (!strstr(argptr, "console="))
174 strcat(argptr, " console=ttyS0,38400");
175#endif
176 170
177#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61 171#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61
178 pr_info("PIOSEL: disabling both ATA and NAND selection\n"); 172 pr_info("PIOSEL: disabling both ATA and NAND selection\n");