bcm63xx: remove 3.3 support
[openwrt/openwrt.git] / target / linux / brcm63xx / patches-3.3 / 432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
diff --git a/target/linux/brcm63xx/patches-3.3/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.3/432-BCM63XX-allow-providing-fixup-data-in-board-data.patch
deleted file mode 100644 (file)
index 8f04fa7..0000000
+++ /dev/null
@@ -1,81 +0,0 @@
-From 5131195413b62df73dfd394fea272830ea8c4e1a Mon Sep 17 00:00:00 2001
-From: Jonas Gorski <jonas.gorski@gmail.com>
-Date: Thu, 3 May 2012 14:40:03 +0200
-Subject: [PATCH 67/80] BCM63XX: allow providing fixup data in board data
-
----
- arch/mips/bcm63xx/boards/board_bcm963xx.c           |   10 +++++++++-
- arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |   10 ++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -33,6 +33,7 @@
- #include <bcm63xx_dev_usb_ehci.h>
- #include <board_bcm963xx.h>
- #include <linux/bcm963xx_tag.h>
-+#include <pci_ath9k_fixup.h>
- #define PFX   "board_bcm963xx: "
-@@ -856,6 +857,7 @@ int __init board_register_devices(void)
- {
-       int button_count = 0;
-       int led_count = 0;
-+      int i;
-       if (board.has_uart0)
-               bcm63xx_uart_register(0);
-@@ -891,7 +893,8 @@ int __init board_register_devices(void)
-        * do this after registering enet devices
-        */
- #ifdef CONFIG_SSB_PCIHOST
--      if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
-+      if (!board.has_caldata &&
-+          !bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
-               memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
-               memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
-               if (ssb_arch_register_fallback_sprom(
-@@ -933,5 +936,9 @@ int __init board_register_devices(void)
-               platform_device_register(&bcm63xx_gpio_keys_device);
-       }
-+      /* register any fixups */
-+      for (i = 0; i < board.has_caldata; i++)
-+              pci_enable_ath9k_fixup(board.caldata[i].slot, board.caldata[i].caldata_offset);
-+
-       return 0;
- }
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -7,6 +7,7 @@
- #include <linux/leds.h>
- #include <bcm63xx_dev_enet.h>
- #include <bcm63xx_dev_dsp.h>
-+#include <pci_ath9k_fixup.h>
- /*
-  * flash mapping
-@@ -14,6 +15,11 @@
- #define BCM963XX_CFE_VERSION_OFFSET   0x570
- #define BCM963XX_NVRAM_OFFSET         0x580
-+struct ath9k_caldata {
-+      unsigned int    slot;
-+      u32             caldata_offset;
-+};
-+
- /*
-  * board definition
-  */
-@@ -32,6 +38,10 @@ struct board_info {
-       unsigned int    has_dsp:1;
-       unsigned int    has_uart0:1;
-       unsigned int    has_uart1:1;
-+      unsigned int    has_caldata:2;
-+
-+      /* wifi calibration data config */
-+      struct ath9k_caldata caldata[2];
-       /* ethernet config */
-       struct bcm63xx_enet_platform_data enet0;