diff options
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r-- | arch/mips/bcm63xx/boards/board_bcm963xx.c | 33 | ||||
-rw-r--r-- | arch/mips/bcm63xx/prom.c | 3 |
2 files changed, 16 insertions, 20 deletions
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 05a35cf5963d..1fe412c43171 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c | |||
@@ -346,27 +346,26 @@ static struct board_info __initdata board_96348gw = { | |||
346 | }; | 346 | }; |
347 | 347 | ||
348 | static struct board_info __initdata board_FAST2404 = { | 348 | static struct board_info __initdata board_FAST2404 = { |
349 | .name = "F@ST2404", | 349 | .name = "F@ST2404", |
350 | .expected_cpu_id = 0x6348, | 350 | .expected_cpu_id = 0x6348, |
351 | |||
352 | .has_enet0 = 1, | ||
353 | .has_enet1 = 1, | ||
354 | .has_pci = 1, | ||
355 | 351 | ||
356 | .enet0 = { | 352 | .has_enet0 = 1, |
357 | .has_phy = 1, | 353 | .has_enet1 = 1, |
358 | .use_internal_phy = 1, | 354 | .has_pci = 1, |
359 | }, | ||
360 | 355 | ||
361 | .enet1 = { | 356 | .enet0 = { |
362 | .force_speed_100 = 1, | 357 | .has_phy = 1, |
363 | .force_duplex_full = 1, | 358 | .use_internal_phy = 1, |
364 | }, | 359 | }, |
365 | 360 | ||
361 | .enet1 = { | ||
362 | .force_speed_100 = 1, | ||
363 | .force_duplex_full = 1, | ||
364 | }, | ||
366 | 365 | ||
367 | .has_ohci0 = 1, | 366 | .has_ohci0 = 1, |
368 | .has_pccard = 1, | 367 | .has_pccard = 1, |
369 | .has_ehci0 = 1, | 368 | .has_ehci0 = 1, |
370 | }; | 369 | }; |
371 | 370 | ||
372 | static struct board_info __initdata board_DV201AMR = { | 371 | static struct board_info __initdata board_DV201AMR = { |
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c index fb284fbc5853..be252efa0757 100644 --- a/arch/mips/bcm63xx/prom.c +++ b/arch/mips/bcm63xx/prom.c | |||
@@ -40,9 +40,6 @@ void __init prom_init(void) | |||
40 | reg &= ~mask; | 40 | reg &= ~mask; |
41 | bcm_perf_writel(reg, PERF_CKCTL_REG); | 41 | bcm_perf_writel(reg, PERF_CKCTL_REG); |
42 | 42 | ||
43 | /* assign command line from kernel config */ | ||
44 | strcpy(arcs_cmdline, CONFIG_CMDLINE); | ||
45 | |||
46 | /* register gpiochip */ | 43 | /* register gpiochip */ |
47 | bcm63xx_gpio_init(); | 44 | bcm63xx_gpio_init(); |
48 | 45 | ||