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>
This commit is contained in:
parent
7084338eb8
commit
ab4ba29168
|
@ -42,7 +42,6 @@ struct txx9_board_vec {
|
||||||
};
|
};
|
||||||
extern struct txx9_board_vec *txx9_board_vec;
|
extern struct txx9_board_vec *txx9_board_vec;
|
||||||
extern int (*txx9_irq_dispatch)(int pending);
|
extern int (*txx9_irq_dispatch)(int pending);
|
||||||
char *prom_getcmdline(void);
|
|
||||||
const char *prom_getenv(const char *name);
|
const char *prom_getenv(const char *name);
|
||||||
void txx9_wdt_init(unsigned long base);
|
void txx9_wdt_init(unsigned long base);
|
||||||
void txx9_wdt_now(unsigned long base);
|
void txx9_wdt_now(unsigned long base);
|
||||||
|
|
|
@ -399,11 +399,6 @@ const char *get_system_type(void)
|
||||||
return txx9_system_type;
|
return txx9_system_type;
|
||||||
}
|
}
|
||||||
|
|
||||||
char * __init prom_getcmdline(void)
|
|
||||||
{
|
|
||||||
return &(arcs_cmdline[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
const char *__init prom_getenv(const char *name)
|
const char *__init prom_getenv(const char *name)
|
||||||
{
|
{
|
||||||
const s32 *str;
|
const s32 *str;
|
||||||
|
|
|
@ -67,8 +67,6 @@ static void jmr3927_board_init(void);
|
||||||
|
|
||||||
static void __init jmr3927_mem_setup(void)
|
static void __init jmr3927_mem_setup(void)
|
||||||
{
|
{
|
||||||
char *argptr;
|
|
||||||
|
|
||||||
set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO);
|
set_io_port_base(JMR3927_PORT_BASE + JMR3927_PCIIO);
|
||||||
|
|
||||||
_machine_restart = jmr3927_machine_restart;
|
_machine_restart = jmr3927_machine_restart;
|
||||||
|
@ -97,11 +95,6 @@ static void __init jmr3927_mem_setup(void)
|
||||||
jmr3927_board_init();
|
jmr3927_board_init();
|
||||||
|
|
||||||
tx3927_sio_init(0, 1 << 1); /* ch1: noCTS */
|
tx3927_sio_init(0, 1 << 1); /* ch1: noCTS */
|
||||||
#ifdef CONFIG_SERIAL_TXX9_CONSOLE
|
|
||||||
argptr = prom_getcmdline();
|
|
||||||
if (!strstr(argptr, "console="))
|
|
||||||
strcat(argptr, " console=ttyS1,115200");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init jmr3927_pci_setup(void)
|
static void __init jmr3927_pci_setup(void)
|
||||||
|
|
|
@ -187,8 +187,6 @@ static void __init rbtx4937_clock_init(void);
|
||||||
|
|
||||||
static void __init rbtx4927_mem_setup(void)
|
static void __init rbtx4927_mem_setup(void)
|
||||||
{
|
{
|
||||||
char *argptr;
|
|
||||||
|
|
||||||
if (TX4927_REV_PCODE() == 0x4927) {
|
if (TX4927_REV_PCODE() == 0x4927) {
|
||||||
rbtx4927_clock_init();
|
rbtx4927_clock_init();
|
||||||
tx4927_setup();
|
tx4927_setup();
|
||||||
|
@ -213,11 +211,6 @@ static void __init rbtx4927_mem_setup(void)
|
||||||
gpio_direction_output(15, 1);
|
gpio_direction_output(15, 1);
|
||||||
|
|
||||||
tx4927_sio_init(0, 0);
|
tx4927_sio_init(0, 0);
|
||||||
#ifdef CONFIG_SERIAL_TXX9_CONSOLE
|
|
||||||
argptr = prom_getcmdline();
|
|
||||||
if (!strstr(argptr, "console="))
|
|
||||||
strcat(argptr, " console=ttyS0,38400");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init rbtx4927_clock_init(void)
|
static void __init rbtx4927_clock_init(void)
|
||||||
|
|
|
@ -153,7 +153,6 @@ static void __init rbtx4938_time_init(void)
|
||||||
static void __init rbtx4938_mem_setup(void)
|
static void __init rbtx4938_mem_setup(void)
|
||||||
{
|
{
|
||||||
unsigned long long pcfg;
|
unsigned long long pcfg;
|
||||||
char *argptr;
|
|
||||||
|
|
||||||
if (txx9_master_clock == 0)
|
if (txx9_master_clock == 0)
|
||||||
txx9_master_clock = 25000000; /* 25MHz */
|
txx9_master_clock = 25000000; /* 25MHz */
|
||||||
|
@ -168,11 +167,6 @@ static void __init rbtx4938_mem_setup(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
tx4938_sio_init(7372800, 0);
|
tx4938_sio_init(7372800, 0);
|
||||||
#ifdef CONFIG_SERIAL_TXX9_CONSOLE
|
|
||||||
argptr = prom_getcmdline();
|
|
||||||
if (!strstr(argptr, "console="))
|
|
||||||
strcat(argptr, " console=ttyS0,38400");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61
|
#ifdef CONFIG_TOSHIBA_RBTX4938_MPLEX_PIO58_61
|
||||||
pr_info("PIOSEL: disabling both ATA and NAND selection\n");
|
pr_info("PIOSEL: disabling both ATA and NAND selection\n");
|
||||||
|
|
Loading…
Reference in New Issue