OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 8... Line 8...
8 arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 10 ++++++++++ 8 arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 10 ++++++++++
9 2 files changed, 18 insertions(+), 1 deletion(-) 9 2 files changed, 18 insertions(+), 1 deletion(-)
Line 10... Line 10...
10   10  
11 --- a/arch/mips/bcm63xx/boards/board_common.c 11 --- a/arch/mips/bcm63xx/boards/board_common.c
12 +++ b/arch/mips/bcm63xx/boards/board_common.c 12 +++ b/arch/mips/bcm63xx/boards/board_common.c
13 @@ -31,6 +31,7 @@ 13 @@ -32,6 +32,7 @@
14 #include <bcm63xx_dev_usb_ohci.h> 14 #include <bcm63xx_dev_usb_ohci.h>
15 #include <bcm63xx_dev_usb_usbd.h> 15 #include <bcm63xx_dev_usb_usbd.h>
16 #include <board_bcm963xx.h> 16 #include <board_bcm963xx.h>
Line 17... Line 17...
17 +#include <pci_ath9k_fixup.h> 17 +#include <pci_ath9k_fixup.h>
Line 18... Line 18...
18 18
19 #include "board_common.h" 19 #include "board_common.h"
20 20
21 @@ -177,6 +178,7 @@ static struct of_device_id of_ids[] = { 21 @@ -178,6 +179,7 @@ static struct of_device_id of_ids[] = {
22 int __init board_register_devices(void) 22 int __init board_register_devices(void)
Line 23... Line 23...
23 { 23 {
24 int usbh_ports = 0; 24 int usbh_ports = 0;
25 + int i; 25 + int i;
26 26
27 #if CONFIG_OF 27 #if CONFIG_OF
Line 28... Line 28...
28 if (of_have_populated_dt()) { 28 if (of_have_populated_dt()) {
29 @@ -241,6 +243,10 @@ int __init board_register_devices(void) 29 @@ -245,6 +247,10 @@ int __init board_register_devices(void)
Line 37... Line 37...
37 return 0; 37 return 0;
38 } 38 }
Line 39... Line 39...
39 39
40 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 40 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
41 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 41 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
42 @@ -8,6 +8,7 @@ -  
43 #include <bcm63xx_dev_enet.h> 42 @@ -9,6 +9,7 @@
-   43 #include <bcm63xx_dev_usb_usbd.h>
44 #include <bcm63xx_dev_usb_usbd.h> 44 #include <bcm63xx_dev_dsp.h>
45 #include <bcm63xx_fallback_sprom.h> 45 #include <bcm63xx_fallback_sprom.h>
Line 46... Line 46...
46 +#include <pci_ath9k_fixup.h> 46 +#include <pci_ath9k_fixup.h>
47 47
48 /* 48 /*
49 * flash mapping 49 * flash mapping
50 @@ -15,6 +16,11 @@ 50 @@ -16,6 +17,11 @@
Line 51... Line 51...
51 #define BCM963XX_CFE_VERSION_OFFSET 0x570 51 #define BCM963XX_CFE_VERSION_OFFSET 0x570
52 #define BCM963XX_NVRAM_OFFSET 0x580 52 #define BCM963XX_NVRAM_OFFSET 0x580
Line 57... Line 57...
57 +}; 57 +};
58 + 58 +
59 /* 59 /*
60 * board definition 60 * board definition
61 */ 61 */
62 @@ -32,6 +38,10 @@ struct board_info { 62 @@ -34,6 +40,10 @@ struct board_info {
63 unsigned int has_ehci0:1; -  
64 unsigned int has_usbd:1; 63 unsigned int has_usbd:1;
-   64 unsigned int has_dsp:1;
65 unsigned int use_fallback_sprom:1; 65 unsigned int use_fallback_sprom:1;
66 + unsigned int has_caldata:2; 66 + unsigned int has_caldata:2;
67 + 67 +
68 + /* wifi calibration data config */ 68 + /* wifi calibration data config */
69 + struct ath9k_caldata caldata[2]; 69 + struct ath9k_caldata caldata[2];