Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 182093
b: refs/heads/master
c: c63d0cb
h: refs/heads/master
i:
  182091: 810ebbf
v: v3
  • Loading branch information
Yoichi Yuasa authored and Ralf Baechle committed Feb 27, 2010
1 parent fa0bd87 commit 06ec311
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 121 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 368bf8ef304f426be0a8a0be5b0e437747598c10
refs/heads/master: c63d0cb5feedbc2cc456b6ea2105c15b563217cf
25 changes: 0 additions & 25 deletions trunk/arch/mips/alchemy/devboards/db1x00/board_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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))
Expand Down
10 changes: 0 additions & 10 deletions trunk/arch/mips/alchemy/devboards/pb1000/board_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
25 changes: 0 additions & 25 deletions trunk/arch/mips/alchemy/devboards/pb1100/board_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
14 changes: 0 additions & 14 deletions trunk/arch/mips/alchemy/devboards/pb1200/board_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 0 additions & 16 deletions trunk/arch/mips/alchemy/devboards/pb1500/board_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 0 additions & 10 deletions trunk/arch/mips/alchemy/devboards/pb1550/board_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,20 +56,10 @@ void board_reset(void)
void __init board_setup(void)
{
u32 pin_func;
char *argptr;

bcsr_init(PB1550_BCSR_PHYS_ADDR,
PB1550_BCSR_PHYS_ADDR + PB1550_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

alchemy_gpio2_enable();

/*
Expand Down
10 changes: 0 additions & 10 deletions trunk/arch/mips/alchemy/mtx-1/board_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,6 @@ static void mtx1_power_off(void)

void __init board_setup(void)
{
#ifdef CONFIG_SERIAL_8250_CONSOLE
char *argptr;
argptr = prom_getcmdline();
argptr = strstr(argptr, "console=");
if (argptr == NULL) {
argptr = prom_getcmdline();
strcat(argptr, " console=ttyS0,115200");
}
#endif

alchemy_gpio2_enable();

#if defined(CONFIG_USB_OHCI_HCD) || defined(CONFIG_USB_OHCI_HCD_MODULE)
Expand Down
10 changes: 0 additions & 10 deletions trunk/arch/mips/alchemy/xxs1500/board_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,6 @@ void __init board_setup(void)
{
u32 pin_func;

#ifdef CONFIG_SERIAL_8250_CONSOLE
char *argptr;
argptr = prom_getcmdline();
argptr = strstr(argptr, "console=");
if (argptr == NULL) {
argptr = prom_getcmdline();
strcat(argptr, " console=ttyS0,115200");
}
#endif

pm_power_off = xxs1500_power_off;
_machine_halt = xxs1500_power_off;
_machine_restart = xxs1500_reset;
Expand Down

0 comments on commit 06ec311

Please sign in to comment.