/branches/18.06.1/target/linux/brcm63xx/patches-4.9/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch |
@@ -10,7 +10,7 @@ |
|
--- a/arch/mips/bcm63xx/boards/board_common.c |
+++ b/arch/mips/bcm63xx/boards/board_common.c |
@@ -31,6 +31,7 @@ |
@@ -32,6 +32,7 @@ |
#include <bcm63xx_dev_usb_ohci.h> |
#include <bcm63xx_dev_usb_usbd.h> |
#include <board_bcm963xx.h> |
@@ -18,7 +18,7 @@ |
|
#include "board_common.h" |
|
@@ -177,6 +178,7 @@ static struct of_device_id of_ids[] = { |
@@ -178,6 +179,7 @@ static struct of_device_id of_ids[] = { |
int __init board_register_devices(void) |
{ |
int usbh_ports = 0; |
@@ -26,7 +26,7 @@ |
|
#if CONFIG_OF |
if (of_have_populated_dt()) { |
@@ -241,6 +243,10 @@ int __init board_register_devices(void) |
@@ -245,6 +247,10 @@ int __init board_register_devices(void) |
board.ephy_reset_gpio_flags); |
} |
|
@@ -39,15 +39,15 @@ |
|
--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |
@@ -8,6 +8,7 @@ |
#include <bcm63xx_dev_enet.h> |
@@ -9,6 +9,7 @@ |
#include <bcm63xx_dev_usb_usbd.h> |
#include <bcm63xx_dev_dsp.h> |
#include <bcm63xx_fallback_sprom.h> |
+#include <pci_ath9k_fixup.h> |
|
/* |
* flash mapping |
@@ -15,6 +16,11 @@ |
@@ -16,6 +17,11 @@ |
#define BCM963XX_CFE_VERSION_OFFSET 0x570 |
#define BCM963XX_NVRAM_OFFSET 0x580 |
|
@@ -59,9 +59,9 @@ |
/* |
* board definition |
*/ |
@@ -32,6 +38,10 @@ struct board_info { |
unsigned int has_ehci0:1; |
@@ -34,6 +40,10 @@ struct board_info { |
unsigned int has_usbd:1; |
unsigned int has_dsp:1; |
unsigned int use_fallback_sprom:1; |
+ unsigned int has_caldata:2; |
+ |