Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Yoichi Yuasa and committed by
Ralf Baechle
ab4ba291 7084338e

-26
-1
arch/mips/include/asm/txx9/generic.h
··· 42 42 }; 43 43 extern struct txx9_board_vec *txx9_board_vec; 44 44 extern int (*txx9_irq_dispatch)(int pending); 45 - char *prom_getcmdline(void); 46 45 const char *prom_getenv(const char *name); 47 46 void txx9_wdt_init(unsigned long base); 48 47 void txx9_wdt_now(unsigned long base);
-5
arch/mips/txx9/generic/setup.c
··· 399 399 return txx9_system_type; 400 400 } 401 401 402 - char * __init prom_getcmdline(void) 403 - { 404 - return &(arcs_cmdline[0]); 405 - } 406 - 407 402 const char *__init prom_getenv(const char *name) 408 403 { 409 404 const s32 *str;
-7
arch/mips/txx9/jmr3927/setup.c
··· 67 67 68 68 static void __init jmr3927_mem_setup(void) 69 69 { 70 - char *argptr; 71 - 72 70 set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO); 73 71 74 72 _machine_restart = jmr3927_machine_restart; ··· 95 97 jmr3927_board_init(); 96 98 97 99 tx3927_sio_init(0, 1 << 1); /* ch1: noCTS */ 98 - #ifdef CONFIG_SERIAL_TXX9_CONSOLE 99 - argptr = prom_getcmdline(); 100 - if (!strstr(argptr, "console=")) 101 - strcat(argptr, " console=ttyS1,115200"); 102 - #endif 103 100 } 104 101 105 102 static void __init jmr3927_pci_setup(void)
-7
arch/mips/txx9/rbtx4927/setup.c
··· 187 187 188 188 static void __init rbtx4927_mem_setup(void) 189 189 { 190 - char *argptr; 191 - 192 190 if (TX4927_REV_PCODE() == 0x4927) { 193 191 rbtx4927_clock_init(); 194 192 tx4927_setup(); ··· 211 213 gpio_direction_output(15, 1); 212 214 213 215 tx4927_sio_init(0, 0); 214 - #ifdef CONFIG_SERIAL_TXX9_CONSOLE 215 - argptr = prom_getcmdline(); 216 - if (!strstr(argptr, "console=")) 217 - strcat(argptr, " console=ttyS0,38400"); 218 - #endif 219 216 } 220 217 221 218 static void __init rbtx4927_clock_init(void)
-6
arch/mips/txx9/rbtx4938/setup.c
··· 153 153 static void __init rbtx4938_mem_setup(void) 154 154 { 155 155 unsigned long long pcfg; 156 - char *argptr; 157 156 158 157 if (txx9_master_clock == 0) 159 158 txx9_master_clock = 25000000; /* 25MHz */ ··· 167 168 #endif 168 169 169 170 tx4938_sio_init(7372800, 0); 170 - #ifdef CONFIG_SERIAL_TXX9_CONSOLE 171 - argptr = prom_getcmdline(); 172 - if (!strstr(argptr, "console=")) 173 - strcat(argptr, " console=ttyS0,38400"); 174 - #endif 175 171 176 172 #ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61 177 173 pr_info("PIOSEL: disabling both ATA and NAND selection\n");