Commit 7179380e authored by Manuel Lauss's avatar Manuel Lauss Committed by Ralf Baechle
Browse files

MIPS: Alchemy: move commandline mangling out of common code 



Not every alchemy-based board might want these options forced on it,
and most of this stuff seems to be intended for devboard code anyway.
Remove commandline mangling code out of common chip code and instead
add relevant sections to all in-tree boards to not change existing
behaviour.

Signed-off-by: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 23ba25d5

arch/mips/alchemy/common/setup.c

+4 −30
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <asm/time.h>



#include <au1000.h>

#include <prom.h>



extern void __init board_setup(void);

extern void au1000_restart(char *);
@@ -46,12 +45,15 @@ extern void set_cpuspec(void); 
void __init plat_mem_setup(void)

{

	struct	cpu_spec *sp;

	char *argptr;

	unsigned long prid, cpufreq, bclk;



	set_cpuspec();

	sp = cur_cpu_spec[0];



	_machine_restart = au1000_restart;

	_machine_halt = au1000_halt;

	pm_power_off = au1000_power_off;



	board_setup();  /* board specific setup */



	prid = read_c0_prid();
@@ -79,34 +81,6 @@ void __init plat_mem_setup(void) 
		/* Clear to obtain best system bus performance */

		clear_c0_config(1 << 19); /* Clear Config[OD] */



	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

	_machine_restart = au1000_restart;

	_machine_halt = au1000_halt;

	pm_power_off = au1000_power_off;



	/* IO/MEM resources. */

	set_io_port_base(0);

	ioport_resource.start = IOPORT_RESOURCE_START;

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

+28 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ 
#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-db1x00/db1x00.h>



#include <prom.h>





static BCSR * const bcsr = (BCSR *)BCSR_KSEG1_ADDR;



const char *get_system_type(void)
@@ -52,6 +55,31 @@ void board_reset(void) 
void __init board_setup(void)

{

	u32 pin_func = 0;

	char *argptr;



	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) && \

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

+10 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/interrupt.h>

#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-pb1x00/pb1000.h>

#include <prom.h>





struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {
@@ -52,6 +53,15 @@ void __init board_setup(void) 
	u32 sys_freqctrl, sys_clksrc;

	u32 prid = read_c0_prid();



#ifdef CONFIG_SERIAL_8250_CONSOLE

	char *argptr = prom_getcmdline();

	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);

	au_writel(0, SYS_PINSTATERD);

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

+27 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-pb1x00/pb1100.h>



#include <prom.h>





struct au1xxx_irqmap __initdata au1xxx_irq_map[] = {

	{ AU1000_GPIO_9,  INTC_INT_LOW_LEVEL, 0 }, /* PCMCIA Card Fully_Inserted# */
@@ -54,6 +56,31 @@ void board_reset(void) 
void __init board_setup(void)

{

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

	char *argptr;



	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);

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

+13 −11
Original line number Diff line number Diff line
@@ -46,7 +46,19 @@ void board_reset(void) 


void __init board_setup(void)

{

	char *argptr = NULL;

	char *argptr;



	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

	{
@@ -104,16 +116,6 @@ void __init board_setup(void) 
	}

#endif



#ifdef CONFIG_FB_AU1200

	argptr = prom_getcmdline();

#ifdef CONFIG_MIPS_PB1200

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

#endif

#ifdef CONFIG_MIPS_DB1200

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

#endif

#endif



	/*

	 * The Pb1200 development board uses external MUX for PSC0 to

	 * support SMB/SPI. bcsr->resets bit 12: 0=SMB 1=SPI

CRA Git | Maintained and supported by SUSTech CRA and CCSE