diff options
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r-- | arch/mips/bcm63xx/boards/board_bcm963xx.c | 26 | ||||
-rw-r--r-- | arch/mips/bcm63xx/early_printk.c | 4 |
2 files changed, 15 insertions, 15 deletions
diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c index 73be9b349690..ed1949c29508 100644 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c | |||
@@ -406,9 +406,9 @@ static struct board_info __initdata board_FAST2404 = { | |||
406 | .expected_cpu_id = 0x6348, | 406 | .expected_cpu_id = 0x6348, |
407 | 407 | ||
408 | .has_uart0 = 1, | 408 | .has_uart0 = 1, |
409 | .has_enet0 = 1, | 409 | .has_enet0 = 1, |
410 | .has_enet1 = 1, | 410 | .has_enet1 = 1, |
411 | .has_pci = 1, | 411 | .has_pci = 1, |
412 | 412 | ||
413 | .enet0 = { | 413 | .enet0 = { |
414 | .has_phy = 1, | 414 | .has_phy = 1, |
@@ -591,22 +591,22 @@ static struct board_info __initdata board_96358vw2 = { | |||
591 | }; | 591 | }; |
592 | 592 | ||
593 | static struct board_info __initdata board_AGPFS0 = { | 593 | static struct board_info __initdata board_AGPFS0 = { |
594 | .name = "AGPF-S0", | 594 | .name = "AGPF-S0", |
595 | .expected_cpu_id = 0x6358, | 595 | .expected_cpu_id = 0x6358, |
596 | 596 | ||
597 | .has_uart0 = 1, | 597 | .has_uart0 = 1, |
598 | .has_enet0 = 1, | 598 | .has_enet0 = 1, |
599 | .has_enet1 = 1, | 599 | .has_enet1 = 1, |
600 | .has_pci = 1, | 600 | .has_pci = 1, |
601 | 601 | ||
602 | .enet0 = { | 602 | .enet0 = { |
603 | .has_phy = 1, | 603 | .has_phy = 1, |
604 | .use_internal_phy = 1, | 604 | .use_internal_phy = 1, |
605 | }, | 605 | }, |
606 | 606 | ||
607 | .enet1 = { | 607 | .enet1 = { |
608 | .force_speed_100 = 1, | 608 | .force_speed_100 = 1, |
609 | .force_duplex_full = 1, | 609 | .force_duplex_full = 1, |
610 | }, | 610 | }, |
611 | 611 | ||
612 | .has_ohci0 = 1, | 612 | .has_ohci0 = 1, |
@@ -677,7 +677,7 @@ static struct ssb_sprom bcm63xx_sprom = { | |||
677 | .revision = 0x02, | 677 | .revision = 0x02, |
678 | .board_rev = 0x17, | 678 | .board_rev = 0x17, |
679 | .country_code = 0x0, | 679 | .country_code = 0x0, |
680 | .ant_available_bg = 0x3, | 680 | .ant_available_bg = 0x3, |
681 | .pa0b0 = 0x15ae, | 681 | .pa0b0 = 0x15ae, |
682 | .pa0b1 = 0xfa85, | 682 | .pa0b1 = 0xfa85, |
683 | .pa0b2 = 0xfe8d, | 683 | .pa0b2 = 0xfe8d, |
diff --git a/arch/mips/bcm63xx/early_printk.c b/arch/mips/bcm63xx/early_printk.c index bf353c937df2..aa8f7f9cc7a4 100644 --- a/arch/mips/bcm63xx/early_printk.c +++ b/arch/mips/bcm63xx/early_printk.c | |||
@@ -10,7 +10,7 @@ | |||
10 | #include <bcm63xx_io.h> | 10 | #include <bcm63xx_io.h> |
11 | #include <bcm63xx_regs.h> | 11 | #include <bcm63xx_regs.h> |
12 | 12 | ||
13 | static void __init wait_xfered(void) | 13 | static void wait_xfered(void) |
14 | { | 14 | { |
15 | unsigned int val; | 15 | unsigned int val; |
16 | 16 | ||
@@ -22,7 +22,7 @@ static void __init wait_xfered(void) | |||
22 | } while (1); | 22 | } while (1); |
23 | } | 23 | } |
24 | 24 | ||
25 | void __init prom_putchar(char c) | 25 | void prom_putchar(char c) |
26 | { | 26 | { |
27 | wait_xfered(); | 27 | wait_xfered(); |
28 | bcm_uart0_writel(c, UART_FIFO_REG); | 28 | bcm_uart0_writel(c, UART_FIFO_REG); |