blob: 16d47b4c58eedc52252743687d58139cc3f5527c [file] [log] [blame]
b.liue9582032025-04-17 19:18:16 +08001From 8879e209111192c5e9752d7bd203cf7582693328 Mon Sep 17 00:00:00 2001
2From: Jonas Gorski <jonas.gorski@gmail.com>
3Date: Thu, 3 May 2012 14:40:03 +0200
4Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
5
6---
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(-)
10
11--- a/arch/mips/bcm63xx/boards/board_common.c
12+++ b/arch/mips/bcm63xx/boards/board_common.c
13@@ -31,6 +31,7 @@
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>
18
19 #include "board_common.h"
20
21@@ -177,6 +178,7 @@ static struct of_device_id of_ids[] = {
22 int __init board_register_devices(void)
23 {
24 int usbh_ports = 0;
25+ int i;
26
27 #if CONFIG_OF
28 if (of_have_populated_dt()) {
29@@ -241,6 +243,10 @@ int __init board_register_devices(void)
30 board.ephy_reset_gpio_flags);
31 }
32
33+ /* register any fixups */
34+ for (i = 0; i < board.has_caldata; i++)
35+ pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset);
36+
37 return 0;
38 }
39
40--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
41+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
42@@ -9,6 +9,7 @@
43 #include <bcm63xx_dev_enet.h>
44 #include <bcm63xx_dev_usb_usbd.h>
45 #include <bcm63xx_fallback_sprom.h>
46+#include <pci_ath9k_fixup.h>
47
48 /*
49 * flash mapping
50@@ -16,6 +17,11 @@
51 #define BCM963XX_CFE_VERSION_OFFSET 0x570
52 #define BCM963XX_NVRAM_OFFSET 0x580
53
54+struct ath9k_caldata {
55+ unsigned int slot;
56+ u32 caldata_offset;
57+};
58+
59 /*
60 * board definition
61 */
62@@ -33,6 +39,10 @@ struct board_info {
63 unsigned int has_ehci0:1;
64 unsigned int has_usbd:1;
65 unsigned int use_fallback_sprom:1;
66+ unsigned int has_caldata:2;
67+
68+ /* wifi calibration data config */
69+ struct ath9k_caldata caldata[2];
70
71 /* ethernet config */
72 struct bcm63xx_enet_platform_data enet0;