OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1 From 33ef960aed15f9a98a2c51d8d794cd72418e0be4 Mon Sep 17 00:00:00 2001 1 From 33ef960aed15f9a98a2c51d8d794cd72418e0be4 Mon Sep 17 00:00:00 2001
2 From: Florian Fainelli <florian@openwrt.org> 2 From: Florian Fainelli <florian@openwrt.org>
3 Date: Mon, 28 Jan 2013 20:06:25 +0100 3 Date: Mon, 28 Jan 2013 20:06:25 +0100
4 Subject: [PATCH 07/11] MIPS: BCM63XX: register OHCI controller if board 4 Subject: [PATCH 07/11] MIPS: BCM63XX: register OHCI controller if board
5 enables it 5 enables it
6   6  
7 BCM63XX-based boards can control the registration of the OHCI controller 7 BCM63XX-based boards can control the registration of the OHCI controller
8 by setting their has_ohci0 flag to 1. Handle this in the generic 8 by setting their has_ohci0 flag to 1. Handle this in the generic
9 code dealing with board registration and call the actual helper to 9 code dealing with board registration and call the actual helper to
10 register the OHCI controller. 10 register the OHCI controller.
11   11  
12 Signed-off-by: Florian Fainelli <florian@openwrt.org> 12 Signed-off-by: Florian Fainelli <florian@openwrt.org>
13 --- 13 ---
14 arch/mips/bcm63xx/boards/board_bcm963xx.c | 4 ++++ 14 arch/mips/bcm63xx/boards/board_bcm963xx.c | 4 ++++
15 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
16   16  
17 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 17 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
18 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 18 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
19 @@ -27,6 +27,7 @@ 19 @@ -28,6 +28,7 @@
20 #include <bcm63xx_dev_hsspi.h> 20 #include <bcm63xx_dev_hsspi.h>
21 #include <bcm63xx_dev_pcmcia.h> 21 #include <bcm63xx_dev_pcmcia.h>
22 #include <bcm63xx_dev_spi.h> 22 #include <bcm63xx_dev_spi.h>
23 +#include <bcm63xx_dev_usb_ohci.h> 23 +#include <bcm63xx_dev_usb_ohci.h>
24 #include <bcm63xx_dev_usb_usbd.h> 24 #include <bcm63xx_dev_usb_usbd.h>
25 #include <board_bcm963xx.h> 25 #include <board_bcm963xx.h>
26 26
27 @@ -881,6 +882,9 @@ int __init board_register_devices(void) 27 @@ -898,6 +899,9 @@ int __init board_register_devices(void)
28 if (board.has_usbd) 28 if (board.has_usbd)
29 bcm63xx_usbd_register(&board.usbd); 29 bcm63xx_usbd_register(&board.usbd);
30 30
31 + if (board.has_ohci0) 31 + if (board.has_ohci0)
32 + bcm63xx_ohci_register(); 32 + bcm63xx_ohci_register();
33 + 33 +
34 /* Generate MAC address for WLAN and register our SPROM, 34 if (board.has_dsp)
35 * do this after registering enet devices 35 bcm63xx_dsp_register(&board.dsp);
36 */ 36
37   37