1 From 8879e209111192c5e9752d7bd203cf7582693328 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jonas.gorski@gmail.com>
3 Date: Thu, 3 May 2012 14:40:03 +0200
4 Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
7 arch/mips/bcm63xx/boards/board_bcm963xx.c | 9 ++++++++-
8 arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 10 ++++++++++
9 2 files changed, 18 insertions(+), 1 deletion(-)
11 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
12 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
14 #include <bcm63xx_dev_usb_ohci.h>
15 #include <bcm63xx_dev_usb_usbd.h>
16 #include <board_bcm963xx.h>
17 +#include <pci_ath9k_fixup.h>
19 #include <uapi/linux/bcm933xx_hcs.h>
20 #include <uapi/linux/bcm963xx_tag.h>
21 @@ -958,6 +959,7 @@ int __init board_register_devices(void)
28 bcm63xx_uart_register(0);
29 @@ -996,7 +998,8 @@ int __init board_register_devices(void)
30 * do this after registering enet devices
32 #ifdef CONFIG_SSB_PCIHOST
33 - if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
34 + if (!board.has_caldata &&
35 + !bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
36 memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
37 memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
38 if (ssb_arch_register_fallback_sprom(
39 @@ -1042,5 +1045,9 @@ int __init board_register_devices(void)
40 platform_device_register(&bcm63xx_gpio_keys_device);
43 + /* register any fixups */
44 + for (i = 0; i < board.has_caldata; i++)
45 + pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset);
49 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
50 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
52 #include <bcm63xx_dev_enet.h>
53 #include <bcm63xx_dev_usb_usbd.h>
54 #include <bcm63xx_dev_dsp.h>
55 +#include <pci_ath9k_fixup.h>
60 #define BCM963XX_CFE_VERSION_OFFSET 0x570
61 #define BCM963XX_NVRAM_OFFSET 0x580
63 +struct ath9k_caldata {
71 @@ -34,6 +40,10 @@ struct board_info {
72 unsigned int has_dsp:1;
73 unsigned int has_uart0:1;
74 unsigned int has_uart1:1;
75 + unsigned int has_caldata:2;
77 + /* wifi calibration data config */
78 + struct ath9k_caldata caldata[2];
81 struct bcm63xx_enet_platform_data enet0;