Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c63d0cb5 authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Ralf Baechle
Browse files

MIPS: Alchemy: Remove forced command line setting 



It is not always used, even if it is available.

Signed-off-by: default avatarYoichi Yuasa <yuasa@linux-mips.org>
Cc: linux-mips <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/893/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 368bf8ef

arch/mips/alchemy/devboards/db1x00/board_setup.c

+0 −25
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ void __init board_setup(void) 
{

	unsigned long bcsr1, bcsr2;

	u32 pin_func;

	char *argptr;



	bcsr1 = DB1000_BCSR_PHYS_ADDR;

	bcsr2 = DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS;
@@ -159,30 +158,6 @@ void __init board_setup(void) 
	/* initialize board register space */

	bcsr_init(bcsr1, bcsr2);



	argptr = prom_getcmdline();

#ifdef CONFIG_SERIAL_8250_CONSOLE

	argptr = strstr(argptr, "console=");

	if (argptr == NULL) {

		argptr = prom_getcmdline();

		strcat(argptr, " console=ttyS0,115200");

	}

#endif



#ifdef CONFIG_FB_AU1100

	argptr = strstr(argptr, "video=");

	if (argptr == NULL) {

		argptr = prom_getcmdline();

		/* default panel */

		/*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/

	}

#endif



#if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000)

	/* au1000 does not support vra, au1500 and au1100 do */

	strcat(argptr, " au1000_audio=vra");

	argptr = prom_getcmdline();

#endif



	/* Not valid for Au1550 */

#if defined(CONFIG_IRDA) && \

   (defined(CONFIG_SOC_AU1000) || defined(CONFIG_SOC_AU1100))

arch/mips/alchemy/devboards/pb1000/board_setup.c

+0 −10
Original line number Diff line number Diff line
@@ -47,19 +47,9 @@ void __init board_setup(void) 
	u32 pin_func, static_cfg0;

	u32 sys_freqctrl, sys_clksrc;

	u32 prid = read_c0_prid();

	char *argptr;



	sys_freqctrl = 0;

	sys_clksrc = 0;

	argptr = prom_getcmdline();



#ifdef CONFIG_SERIAL_8250_CONSOLE

	argptr = strstr(argptr, "console=");

	if (argptr == NULL) {

		argptr = prom_getcmdline();

		strcat(argptr, " console=ttyS0,115200");

	}

#endif



	/* Set AUX clock to 12 MHz * 8 = 96 MHz */

	au_writel(8, SYS_AUXPLL);

arch/mips/alchemy/devboards/pb1100/board_setup.c

+0 −25
Original line number Diff line number Diff line
@@ -47,35 +47,10 @@ void board_reset(void) 
void __init board_setup(void)

{

	volatile void __iomem *base = (volatile void __iomem *)0xac000000UL;

	char *argptr;



	bcsr_init(DB1000_BCSR_PHYS_ADDR,

		  DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);



	argptr = prom_getcmdline();

#ifdef CONFIG_SERIAL_8250_CONSOLE

	argptr = strstr(argptr, "console=");

	if (argptr == NULL) {

		argptr = prom_getcmdline();

		strcat(argptr, " console=ttyS0,115200");

	}

#endif



#ifdef CONFIG_FB_AU1100

	argptr = strstr(argptr, "video=");

	if (argptr == NULL) {

		argptr = prom_getcmdline();

		/* default panel */

		/*strcat(argptr, " video=au1100fb:panel:Sharp_320x240_16");*/

	}

#endif



#if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000)

	/* au1000 does not support vra, au1500 and au1100 do */

	strcat(argptr, " au1000_audio=vra");

	argptr = prom_getcmdline();

#endif



	/* Set AUX clock to 12 MHz * 8 = 96 MHz */

	au_writel(8, SYS_AUXPLL);

	alchemy_gpio1_input_enable();

arch/mips/alchemy/devboards/pb1200/board_setup.c

+0 −14
Original line number Diff line number Diff line
@@ -56,24 +56,10 @@ void board_reset(void) 


void __init board_setup(void)

{

	char *argptr;



	printk(KERN_INFO "AMD Alchemy Pb1200 Board\n");

	bcsr_init(PB1200_BCSR_PHYS_ADDR,

		  PB1200_BCSR_PHYS_ADDR + PB1200_BCSR_HEXLED_OFS);



	argptr = prom_getcmdline();

#ifdef CONFIG_SERIAL_8250_CONSOLE

	argptr = strstr(argptr, "console=");

	if (argptr == NULL) {

		argptr = prom_getcmdline();

		strcat(argptr, " console=ttyS0,115200");

	}

#endif

#ifdef CONFIG_FB_AU1200

	strcat(argptr, " video=au1200fb:panel:bs");

#endif



#if 0

	{

		u32 pin_func;

arch/mips/alchemy/devboards/pb1500/board_setup.c

+0 −16
Original line number Diff line number Diff line
@@ -54,26 +54,10 @@ void __init board_setup(void) 
{

	u32 pin_func;

	u32 sys_freqctrl, sys_clksrc;

	char *argptr;



	bcsr_init(DB1000_BCSR_PHYS_ADDR,

		  DB1000_BCSR_PHYS_ADDR + DB1000_BCSR_HEXLED_OFS);



	argptr = prom_getcmdline();

#ifdef CONFIG_SERIAL_8250_CONSOLE

	argptr = strstr(argptr, "console=");

	if (argptr == NULL) {

		argptr = prom_getcmdline();

		strcat(argptr, " console=ttyS0,115200");

	}

#endif



#if defined(CONFIG_SOUND_AU1X00) && !defined(CONFIG_SOC_AU1000)

	/* au1000 does not support vra, au1500 and au1100 do */

	strcat(argptr, " au1000_audio=vra");

	argptr = prom_getcmdline();

#endif



	sys_clksrc = sys_freqctrl = pin_func = 0;

	/* Set AUX clock to 12 MHz * 8 = 96 MHz */

	au_writel(8, SYS_AUXPLL);