OpenWrt – Diff between revs 2 and 3
?pathlinks?
Rev 2 | Rev 3 | |||
---|---|---|---|---|
Line 1... | Line 1... | |||
1 | --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
1 | --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
|
2 | +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
2 | +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
|
3 | @@ -39,6 +39,7 @@ struct board_info { |
3 | @@ -41,6 +41,7 @@ struct board_info { |
|
Line 4... | Line 4... | |||
4 | |
4 | |
|
5 | /* USB config */ |
5 | /* USB config */ |
|
6 | struct bcm63xx_usbd_platform_data usbd; |
6 | struct bcm63xx_usbd_platform_data usbd; |
|
Line 7... | Line 7... | |||
7 | + unsigned int num_usbh_ports:2; |
7 | + unsigned int num_usbh_ports:2; |
|
8 | |
8 | |
|
9 | /* GPIO LEDs */ |
9 | /* DSP config */ |
|
10 | struct gpio_led leds[5]; |
10 | struct bcm63xx_dsp_platform_data dsp; |
|
11 | --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h |
11 | --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h |
|
12 | +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h |
12 | +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h |
|
13 | @@ -1,6 +1,6 @@ |
13 | @@ -1,6 +1,6 @@ |
|
Line 28... | Line 28... | |||
28 | +int bcm63xx_ohci_register(unsigned int num_ports); |
28 | +int bcm63xx_ohci_register(unsigned int num_ports); |
|
Line 29... | Line 29... | |||
29 | |
29 | |
|
30 | #endif /* BCM63XX_DEV_USB_OHCI_H_ */ |
30 | #endif /* BCM63XX_DEV_USB_OHCI_H_ */ |
|
31 | --- a/arch/mips/bcm63xx/boards/board_common.c |
31 | --- a/arch/mips/bcm63xx/boards/board_common.c |
|
32 | +++ b/arch/mips/bcm63xx/boards/board_common.c |
32 | +++ b/arch/mips/bcm63xx/boards/board_common.c |
|
33 | @@ -165,6 +165,8 @@ static struct platform_device bcm63xx_gp |
33 | @@ -166,6 +166,8 @@ static struct platform_device bcm63xx_gp |
|
34 | */ |
34 | */ |
|
35 | int __init board_register_devices(void) |
35 | int __init board_register_devices(void) |
|
36 | { |
36 | { |
|
37 | + int usbh_ports = 0; |
37 | + int usbh_ports = 0; |
|
38 | + |
38 | + |
|
39 | if (board.has_uart0) |
39 | if (board.has_uart0) |
|
Line 40... | Line 40... | |||
40 | bcm63xx_uart_register(0); |
40 | bcm63xx_uart_register(0); |
|
41 | |
41 | |
|
42 | @@ -186,14 +188,21 @@ int __init board_register_devices(void) |
42 | @@ -187,14 +189,21 @@ int __init board_register_devices(void) |
|
Line 43... | Line 43... | |||
43 | !board_get_mac_address(board.enetsw.mac_addr)) |
43 | !board_get_mac_address(board.enetsw.mac_addr)) |
|
44 | bcm63xx_enetsw_register(&board.enetsw); |
44 | bcm63xx_enetsw_register(&board.enetsw); |
|
Line 59... | Line 59... | |||
59 | |
59 | |
|
60 | if (board.has_ohci0) |
60 | if (board.has_ohci0) |
|
61 | - bcm63xx_ohci_register(); |
61 | - bcm63xx_ohci_register(); |
|
Line 62... | Line 62... | |||
62 | + bcm63xx_ohci_register(usbh_ports); |
62 | + bcm63xx_ohci_register(usbh_ports); |
|
63 | |
63 | |
|
64 | /* Generate MAC address for WLAN and register our SPROM, |
64 | if (board.has_dsp) |
|
65 | * do this after registering enet devices |
65 | bcm63xx_dsp_register(&board.dsp); |
|
66 | --- a/arch/mips/bcm63xx/dev-usb-ehci.c |
66 | --- a/arch/mips/bcm63xx/dev-usb-ehci.c |
|
67 | +++ b/arch/mips/bcm63xx/dev-usb-ehci.c |
67 | +++ b/arch/mips/bcm63xx/dev-usb-ehci.c |
|
68 | @@ -79,12 +79,14 @@ static struct platform_device bcm63xx_eh |
68 | @@ -79,12 +79,14 @@ static struct platform_device bcm63xx_eh |