Cleaned up package/mac80211 compat-wireless patches

package/kernel/mac80211/patches/030-rt2x00_options.patch

@@ -1,47 +0,0 @@
---- a/drivers/net/wireless/rt2x00/Kconfig
-+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -225,36 +225,37 @@ config RT2800SOC
- 
- 
- config RT2800_LIB
--	tristate
-+	tristate "RT2800 USB/PCI support"
- 	depends on m
- 
- config RT2800_LIB_MMIO
--	tristate
-+	tristate "RT2800 MMIO support"
- 	depends on m
- 	select RT2X00_LIB_MMIO
- 	select RT2800_LIB
- 
- config RT2X00_LIB_MMIO
--	tristate
-+	tristate "RT2x00 MMIO support"
- 	depends on m
- 
- config RT2X00_LIB_PCI
--	tristate
-+	tristate "RT2x00 PCI support"
- 	depends on m
- 	select RT2X00_LIB
- 
- config RT2X00_LIB_SOC
--	tristate
-+	tristate "RT2x00 SoC support"
-+	depends on SOC_RT288X || SOC_RT305X
- 	depends on m
- 	select RT2X00_LIB
- 
- config RT2X00_LIB_USB
--	tristate
-+	tristate "RT2x00 USB support"
- 	depends on m
- 	select RT2X00_LIB
- 
- config RT2X00_LIB
--	tristate
-+	tristate "RT2x00 support"
- 	depends on m
- 	select BACKPORT_AVERAGE
- 

package/kernel/mac80211/patches/040-brcmutil_option.patch

@@ -1,9 +0,0 @@
---- a/drivers/net/wireless/brcm80211/Kconfig
-+++ b/drivers/net/wireless/brcm80211/Kconfig
-@@ -1,5 +1,5 @@
- config BRCMUTIL
--	tristate
-+	tristate "Broadcom 802.11 driver utility functions"
- 	depends on m
- 
- config BRCMSMAC

package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch

@@ -1,129 +0,0 @@
---- a/.local-symbols
-+++ b/.local-symbols
-@@ -423,42 +423,6 @@ USB_CDC_PHONET=
- USB_IPHETH=
- USB_SIERRA_NET=
- USB_VL600=
--SSB_POSSIBLE=
--SSB=
--SSB_SPROM=
--SSB_BLOCKIO=
--SSB_PCIHOST_POSSIBLE=
--SSB_PCIHOST=
--SSB_B43_PCI_BRIDGE=
--SSB_PCMCIAHOST_POSSIBLE=
--SSB_PCMCIAHOST=
--SSB_SDIOHOST_POSSIBLE=
--SSB_SDIOHOST=
--SSB_SILENT=
--SSB_DEBUG=
--SSB_SERIAL=
--SSB_DRIVER_PCICORE_POSSIBLE=
--SSB_DRIVER_PCICORE=
--SSB_PCICORE_HOSTMODE=
--SSB_DRIVER_MIPS=
--SSB_SFLASH=
--SSB_EMBEDDED=
--SSB_DRIVER_EXTIF=
--SSB_DRIVER_GIGE=
--SSB_DRIVER_GPIO=
--BCMA_POSSIBLE=
--BCMA=
--BCMA_BLOCKIO=
--BCMA_HOST_PCI_POSSIBLE=
--BCMA_HOST_PCI=
--BCMA_DRIVER_PCI_HOSTMODE=
--BCMA_HOST_SOC=
--BCMA_DRIVER_MIPS=
--BCMA_SFLASH=
--BCMA_NFLASH=
--BCMA_DRIVER_GMAC_CMN=
--BCMA_DRIVER_GPIO=
--BCMA_DEBUG=
- NFC=
- NFC_DIGITAL=
- NFC_NCI=
---- a/Kconfig
-+++ b/Kconfig
-@@ -33,9 +33,6 @@ source drivers/net/wireless/Kconfig
- source drivers/net/ethernet/Kconfig
- source drivers/net/usb/Kconfig
- 
--source drivers/ssb/Kconfig
--source drivers/bcma/Kconfig
--
- source net/nfc/Kconfig
- 
- source drivers/media/Kconfig
---- a/Makefile.kernel
-+++ b/Makefile.kernel
-@@ -25,8 +25,6 @@ obj-$(CPTCFG_MAC80211) += net/mac80211/
- obj-$(CPTCFG_WLAN) += drivers/net/wireless/
- obj-$(CPTCFG_BT) += net/bluetooth/
- obj-$(CPTCFG_BT) += drivers/bluetooth/
--obj-$(CPTCFG_SSB) += drivers/ssb/
--obj-$(CPTCFG_BCMA) += drivers/bcma/
- obj-$(CPTCFG_ETHERNET) += drivers/net/ethernet/
- obj-$(CPTCFG_USB_NET_RNDIS_WLAN) += drivers/net/usb/
- obj-$(CPTCFG_NFC) += net/nfc/
---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -2828,7 +2828,7 @@ static struct ssb_device *b43_ssb_gpio_d
- {
- 	struct ssb_bus *bus = dev->dev->sdev->bus;
- 
--#ifdef CPTCFG_SSB_DRIVER_PCICORE
-+#ifdef CONFIG_SSB_DRIVER_PCICORE
- 	return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
- #else
- 	return bus->chipco.dev;
-@@ -4858,7 +4858,7 @@ static int b43_wireless_core_init(struct
- 	}
- 	if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
- 		hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
--#if defined(CPTCFG_B43_SSB) && defined(CPTCFG_SSB_DRIVER_PCICORE)
-+#if defined(CPTCFG_B43_SSB) && defined(CONFIG_SSB_DRIVER_PCICORE)
- 	if (dev->dev->bus_type == B43_BUS_SSB &&
- 	    dev->dev->sdev->bus->bustype == SSB_BUSTYPE_PCI &&
- 	    dev->dev->sdev->bus->pcicore.dev->id.revision <= 10)
---- a/drivers/net/wireless/b43legacy/main.c
-+++ b/drivers/net/wireless/b43legacy/main.c
-@@ -1937,7 +1937,7 @@ static int b43legacy_gpio_init(struct b4
- 	if (dev->dev->id.revision >= 2)
- 		mask  |= 0x0010; /* FIXME: This is redundant. */
- 
--#ifdef CPTCFG_SSB_DRIVER_PCICORE
-+#ifdef CONFIG_SSB_DRIVER_PCICORE
- 	pcidev = bus->pcicore.dev;
- #endif
- 	gpiodev = bus->chipco.dev ? : pcidev;
-@@ -1956,7 +1956,7 @@ static void b43legacy_gpio_cleanup(struc
- 	struct ssb_bus *bus = dev->dev->bus;
- 	struct ssb_device *gpiodev, *pcidev = NULL;
- 
--#ifdef CPTCFG_SSB_DRIVER_PCICORE
-+#ifdef CONFIG_SSB_DRIVER_PCICORE
- 	pcidev = bus->pcicore.dev;
- #endif
- 	gpiodev = bus->chipco.dev ? : pcidev;
---- a/drivers/net/wireless/brcm80211/brcmsmac/Makefile
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/Makefile
-@@ -43,6 +43,6 @@ brcmsmac-y := \
- 	brcms_trace_events.o \
- 	debug.o
- 
--brcmsmac-$(CPTCFG_BCMA_DRIVER_GPIO) += led.o
-+brcmsmac-$(CONFIG_BCMA_DRIVER_GPIO) += led.o
- 
- obj-$(CPTCFG_BRCMSMAC)	+= brcmsmac.o
---- a/drivers/net/wireless/brcm80211/brcmsmac/led.h
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/led.h
-@@ -22,7 +22,7 @@ struct brcms_led {
- 	bool active_low;
- };
- 
--#ifdef CPTCFG_BCMA_DRIVER_GPIO
-+#ifdef CONFIG_BCMA_DRIVER_GPIO
- void brcms_led_unregister(struct brcms_info *wl);
- int brcms_led_register(struct brcms_info *wl);
- #else

package/kernel/mac80211/patches/303-ath10k-add-SURVEY_INFO_IN_USE-for-current-channel-on.patch

@@ -1,20 +0,0 @@
-From: Felix Fietkau <nbd@openwrt.org>
-Date: Wed, 22 Oct 2014 18:44:03 +0200
-Subject: [PATCH] ath10k: add SURVEY_INFO_IN_USE for current channel on
- survey
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
----
-
---- a/drivers/net/wireless/ath/ath10k/mac.c
-+++ b/drivers/net/wireless/ath/ath10k/mac.c
-@@ -4044,6 +4044,9 @@ static int ath10k_get_survey(struct ieee
- 
- 	survey->channel = &sband->channels[idx];
- 
-+	if (ar->rx_channel == survey->channel)
-+		survey->filled |= SURVEY_INFO_IN_USE;
-+
- exit:
- 	mutex_unlock(&ar->conf_mutex);
- 	return ret;

package/kernel/mac80211/patches/305-b43-fix-NULL-pointer-dereference-in-b43_phy_copy.patch

@@ -1,38 +0,0 @@
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Wed, 5 Nov 2014 23:31:07 +0100
-Subject: [PATCH] b43: fix NULL pointer dereference in b43_phy_copy()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-phy_read and phy_write are not set for every phy any more sine this:
-commit d342b95dd735014a590f9051b1ba227eb54ca8f6
-Author: Rafał Miłecki <zajec5@gmail.com>
-Date:   Thu Jul 31 21:59:43 2014 +0200
-
-    b43: don't duplicate common PHY read/write ops
-
-b43_phy_copy() accesses phy_read and phy_write directly and will fail
-with some phys. This patch fixes the regression by using the
-b43_phy_read() and b43_phy_write() functions which should be used for
-read and write access.
-
-This should fix this bug report:
-https://bugzilla.kernel.org/show_bug.cgi?id=87731
-
-Reported-by: Volker Kempter <v.kempter@pe.tu-clausthal.de>
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
-
---- a/drivers/net/wireless/b43/phy_common.c
-+++ b/drivers/net/wireless/b43/phy_common.c
-@@ -301,8 +301,7 @@ void b43_phy_write(struct b43_wldev *dev
- void b43_phy_copy(struct b43_wldev *dev, u16 destreg, u16 srcreg)
- {
- 	assert_mac_suspended(dev);
--	dev->phy.ops->phy_write(dev, destreg,
--		dev->phy.ops->phy_read(dev, srcreg));
-+	b43_phy_write(dev, destreg, b43_phy_read(dev, srcreg));
- }
- 
- void b43_phy_mask(struct b43_wldev *dev, u16 offset, u16 mask)

package/kernel/mac80211/patches/308-rt2x00-do-not-align-payload-on-modern-H-W.patch

@@ -1,95 +0,0 @@
-From: Stanislaw Gruszka <sgruszka@redhat.com>
-Date: Sun, 2 Nov 2014 13:38:47 +0100
-Subject: [PATCH] rt2x00: do not align payload on modern H/W
-
-RT2800 and newer hardware require padding between header and payload if
-header length is not multiple of 4.
-
-For historical reasons we also align payload to to 4 bytes boundary, but
-such alignment is not needed on modern H/W.
-
-Patch improve performance on embedded CPUs and _possibly_ fixes
-skb_under_panic problems reported from time to time:
-
-https://bugzilla.kernel.org/show_bug.cgi?id=84911
-https://bugzilla.kernel.org/show_bug.cgi?id=72471
-http://marc.info/?l=linux-wireless&m=139108549530402&w=2
-https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1087591
-
-But we can not explain or otherwise confirm the patch fixes this panic
-issue for sure.
-
-Originally-From: Helmut Schaa <helmut.schaa@googlemail.com>
-Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
----
-
---- a/drivers/net/wireless/rt2x00/rt2x00queue.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
-@@ -158,55 +158,29 @@ void rt2x00queue_align_frame(struct sk_b
- 	skb_trim(skb, frame_length);
- }
- 
--void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int header_length)
-+/*
-+ * H/W needs L2 padding between the header and the paylod if header size
-+ * is not 4 bytes aligned.
-+ */
-+void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int hdr_len)
- {
--	unsigned int payload_length = skb->len - header_length;
--	unsigned int header_align = ALIGN_SIZE(skb, 0);
--	unsigned int payload_align = ALIGN_SIZE(skb, header_length);
--	unsigned int l2pad = payload_length ? L2PAD_SIZE(header_length) : 0;
-+	unsigned int l2pad = (skb->len > hdr_len) ? L2PAD_SIZE(hdr_len) : 0;
- 
--	/*
--	 * Adjust the header alignment if the payload needs to be moved more
--	 * than the header.
--	 */
--	if (payload_align > header_align)
--		header_align += 4;
--
--	/* There is nothing to do if no alignment is needed */
--	if (!header_align)
-+	if (!l2pad)
- 		return;
- 
--	/* Reserve the amount of space needed in front of the frame */
--	skb_push(skb, header_align);
--
--	/*
--	 * Move the header.
--	 */
--	memmove(skb->data, skb->data + header_align, header_length);
--
--	/* Move the payload, if present and if required */
--	if (payload_length && payload_align)
--		memmove(skb->data + header_length + l2pad,
--			skb->data + header_length + l2pad + payload_align,
--			payload_length);
--
--	/* Trim the skb to the correct size */
--	skb_trim(skb, header_length + l2pad + payload_length);
-+	skb_push(skb, l2pad);
-+	memmove(skb->data, skb->data + l2pad, hdr_len);
- }
- 
--void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length)
-+void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int hdr_len)
- {
--	/*
--	 * L2 padding is only present if the skb contains more than just the
--	 * IEEE 802.11 header.
--	 */
--	unsigned int l2pad = (skb->len > header_length) ?
--				L2PAD_SIZE(header_length) : 0;
-+	unsigned int l2pad = (skb->len > hdr_len) ? L2PAD_SIZE(hdr_len) : 0;
- 
- 	if (!l2pad)
- 		return;
- 
--	memmove(skb->data + l2pad, skb->data, header_length);
-+	memmove(skb->data + l2pad, skb->data, hdr_len);
- 	skb_pull(skb, l2pad);
- }
- 

package/kernel/mac80211/patches/600-0001-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch

@@ -1,62 +0,0 @@
-From 7a69da907de668fb22a30ae218062d6f081864ea Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sat, 17 Aug 2013 19:31:41 +0200
-Subject: [PATCH] rt2x00: rt2800lib: move rt2800_drv_data declaration into
- rt2800lib.h
-
-The rt2800_drv_data structure contains driver specific
-information. Move the declaration into the rt2800lib.h
-header which is a more logical place for it. Also fix
-the comment style to avoid checkpatch warning.
-
-The patch contains no functional changes, it is in
-preparation for the next patch.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
-Changes since v1: ---
----
- drivers/net/wireless/rt2x00/rt2800.h    |   13 -------------
- drivers/net/wireless/rt2x00/rt2800lib.h |   11 +++++++++++
- 2 files changed, 11 insertions(+), 13 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -2960,17 +2960,4 @@ enum rt2800_eeprom_word {
-  */
- #define BCN_TBTT_OFFSET 64
- 
--/*
-- * RT2800 driver data structure
-- */
--struct rt2800_drv_data {
--	u8 calibration_bw20;
--	u8 calibration_bw40;
--	u8 bbp25;
--	u8 bbp26;
--	u8 txmixer_gain_24g;
--	u8 txmixer_gain_5g;
--	unsigned int tbtt_tick;
--};
--
- #endif /* RT2800_H */
---- a/drivers/net/wireless/rt2x00/rt2800lib.h
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
-@@ -20,6 +20,17 @@
- #ifndef RT2800LIB_H
- #define RT2800LIB_H
- 
-+/* RT2800 driver data structure */
-+struct rt2800_drv_data {
-+	u8 calibration_bw20;
-+	u8 calibration_bw40;
-+	u8 bbp25;
-+	u8 bbp26;
-+	u8 txmixer_gain_24g;
-+	u8 txmixer_gain_5g;
-+	unsigned int tbtt_tick;
-+};
-+
- struct rt2800_ops {
- 	void (*register_read)(struct rt2x00_dev *rt2x00dev,
- 			      const unsigned int offset, u32 *value);

package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch

@@ -1,80 +0,0 @@
-From a7f268af31dddf763fe3dbe9cbf96ea77e0540e0 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sat, 17 Aug 2013 19:31:41 +0200
-Subject: [PATCH] rt2x00: rt2800lib: introduce RT2800_HAS_HIGH_SHARED_MEM flag
-
-Some chipsets have more than 16KB of shared memory.
-Introduce a new rt2800 specific flag to indicate that
-and add a helper function which helps to check the
-presence of the new flag.
-
-Also enable the new flag for the RT3593 chipset which
-has 24KB of shared memory. The flag can also be used
-for other chipsets, but none of those has been tested
-yet.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
-Changes since v1:
-  - don't enable the new flag for RT3071 and RT5592
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    4 ++++
- drivers/net/wireless/rt2x00/rt2800lib.h |   13 +++++++++++++
- 2 files changed, 17 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7740,6 +7740,7 @@ static int rt2800_probe_rt(struct rt2x00
- 
- int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
- {
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
- 	int retval;
- 	u32 reg;
- 
-@@ -7747,6 +7748,9 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- 	if (retval)
- 		return retval;
- 
-+	if (rt2x00_rt(rt2x00dev, RT3593))
-+		__set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
-+
- 	/*
- 	 * Allocate eeprom data.
- 	 */
---- a/drivers/net/wireless/rt2x00/rt2800lib.h
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
-@@ -20,6 +20,10 @@
- #ifndef RT2800LIB_H
- #define RT2800LIB_H
- 
-+enum rt2800_flag {
-+	RT2800_HAS_HIGH_SHARED_MEM,
-+};
-+
- /* RT2800 driver data structure */
- struct rt2800_drv_data {
- 	u8 calibration_bw20;
-@@ -29,6 +33,8 @@ struct rt2800_drv_data {
- 	u8 txmixer_gain_24g;
- 	u8 txmixer_gain_5g;
- 	unsigned int tbtt_tick;
-+
-+	unsigned long rt2800_flags;
- };
- 
- struct rt2800_ops {
-@@ -61,6 +67,13 @@ struct rt2800_ops {
- 	__le32 *(*drv_get_txwi)(struct queue_entry *entry);
- };
- 
-+static inline bool rt2800_has_high_shared_mem(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+
-+	return test_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
-+}
-+
- static inline void rt2800_register_read(struct rt2x00_dev *rt2x00dev,
- 					const unsigned int offset,
- 					u32 *value)

package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch

@@ -1,531 +0,0 @@
-From 250a1b520cd7fdc0df4fc3fedea9066913f49ecf Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sat, 17 Aug 2013 19:31:42 +0200
-Subject: [PATCH] rt2x00: rt2800: serialize shared memory access
-
-The shared memory of the rt2800 devices is accessible
-through the register offset range between 0x4000 and
-0x8000. The size of this range is 16KB only and on
-devices which have more than 16KB of shared memory either
-the low or the high part of the memory is accessible at a
-time.
-
-Serialize all accesses to the shared memory by a mutex,
-in order to avoid concurrent use of that.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
-Changes since v1: ---
----
- drivers/net/wireless/rt2x00/rt2800lib.c  |   55 +++++++++++++++++++++++++++++-
- drivers/net/wireless/rt2x00/rt2800lib.h  |   32 +++++++++++++++++
- drivers/net/wireless/rt2x00/rt2800mmio.c |   26 ++++++++++++++
- drivers/net/wireless/rt2x00/rt2800mmio.h |    4 +++
- drivers/net/wireless/rt2x00/rt2800pci.c  |   14 ++++++++
- drivers/net/wireless/rt2x00/rt2800soc.c  |    3 ++
- drivers/net/wireless/rt2x00/rt2800usb.c  |   31 +++++++++++++++++
- 7 files changed, 164 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -451,11 +451,13 @@ void rt2800_mcu_request(struct rt2x00_de
- 		rt2x00_set_field32(&reg, H2M_MAILBOX_CSR_CMD_TOKEN, token);
- 		rt2x00_set_field32(&reg, H2M_MAILBOX_CSR_ARG0, arg0);
- 		rt2x00_set_field32(&reg, H2M_MAILBOX_CSR_ARG1, arg1);
-+		rt2800_shared_mem_lock(rt2x00dev);
- 		rt2800_register_write_lock(rt2x00dev, H2M_MAILBOX_CSR, reg);
- 
- 		reg = 0;
- 		rt2x00_set_field32(&reg, HOST_CMD_CSR_HOST_COMMAND, command);
- 		rt2800_register_write_lock(rt2x00dev, HOST_CMD_CSR, reg);
-+		rt2800_shared_mem_unlock(rt2x00dev);
- 	}
- 
- 	mutex_unlock(&rt2x00dev->csr_mutex);
-@@ -674,7 +676,9 @@ int rt2800_load_firmware(struct rt2x00_d
- 	 * Wait for device to stabilize.
- 	 */
- 	for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-+		rt2800_shared_mem_lock(rt2x00dev);
- 		rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
-+		rt2800_shared_mem_unlock(rt2x00dev);
- 		if (rt2x00_get_field32(reg, PBF_SYS_CTRL_READY))
- 			break;
- 		msleep(1);
-@@ -694,10 +698,16 @@ int rt2800_load_firmware(struct rt2x00_d
- 	/*
- 	 * Initialize firmware.
- 	 */
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
- 	rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
-+	rt2800_shared_mem_unlock(rt2x00dev);
-+
- 	if (rt2x00_is_usb(rt2x00dev)) {
-+		rt2800_shared_mem_lock(rt2x00dev);
- 		rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
-+		rt2800_shared_mem_unlock(rt2x00dev);
-+
- 		rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
- 	}
- 	msleep(1);
-@@ -1035,8 +1045,10 @@ void rt2800_write_beacon(struct queue_en
- 
- 	beacon_base = rt2800_hw_beacon_base(rt2x00dev, entry->entry_idx);
- 
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2800_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data,
- 				   entry->skb->len + padding_len);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 	__set_bit(ENTRY_BCN_ENABLED, &entry->flags);
- 
- 	/*
-@@ -1066,6 +1078,8 @@ static inline void rt2800_clear_beacon_r
- 
- 	beacon_base = rt2800_hw_beacon_base(rt2x00dev, index);
- 
-+	rt2800_shared_mem_lock(rt2x00dev);
-+
- 	/*
- 	 * For the Beacon base registers we only need to clear
- 	 * the whole TXWI which (when set to 0) will invalidate
-@@ -1073,6 +1087,8 @@ static inline void rt2800_clear_beacon_r
- 	 */
- 	for (i = 0; i < txwi_desc_size; i += sizeof(__le32))
- 		rt2800_register_write(rt2x00dev, beacon_base + i, 0);
-+
-+	rt2800_shared_mem_unlock(rt2x00dev);
- }
- 
- void rt2800_clear_beacon(struct queue_entry *entry)
-@@ -1261,7 +1277,9 @@ static void rt2800_delete_wcid_attr(stru
- {
- 	u32 offset;
- 	offset = MAC_WCID_ATTR_ENTRY(wcid);
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2800_register_write(rt2x00dev, offset, 0);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- }
- 
- static void rt2800_config_wcid_attr_bssidx(struct rt2x00_dev *rt2x00dev,
-@@ -1274,11 +1292,13 @@ static void rt2800_config_wcid_attr_bssi
- 	 * The BSS Idx numbers is split in a main value of 3 bits,
- 	 * and a extended field for adding one additional bit to the value.
- 	 */
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2800_register_read(rt2x00dev, offset, &reg);
- 	rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX, (bssidx & 0x7));
- 	rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX_EXT,
- 			   (bssidx & 0x8) >> 3);
- 	rt2800_register_write(rt2x00dev, offset, reg);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- }
- 
- static void rt2800_config_wcid_attr_cipher(struct rt2x00_dev *rt2x00dev,
-@@ -1291,6 +1311,7 @@ static void rt2800_config_wcid_attr_ciph
- 
- 	offset = MAC_WCID_ATTR_ENTRY(key->hw_key_idx);
- 
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	if (crypto->cmd == SET_KEY) {
- 		rt2800_register_read(rt2x00dev, offset, &reg);
- 		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,
-@@ -1315,6 +1336,7 @@ static void rt2800_config_wcid_attr_ciph
- 		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, 0);
- 		rt2800_register_write(rt2x00dev, offset, reg);
- 	}
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
- 
-@@ -1324,8 +1346,11 @@ static void rt2800_config_wcid_attr_ciph
- 	    (crypto->cipher == CIPHER_AES))
- 		iveiv_entry.iv[3] |= 0x20;
- 	iveiv_entry.iv[3] |= key->keyidx << 6;
-+
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2800_register_multiwrite(rt2x00dev, offset,
- 				      &iveiv_entry, sizeof(iveiv_entry));
-+	rt2800_shared_mem_unlock(rt2x00dev);
- }
- 
- int rt2800_config_shared_key(struct rt2x00_dev *rt2x00dev,
-@@ -1348,8 +1373,11 @@ int rt2800_config_shared_key(struct rt2x
- 		       sizeof(key_entry.rx_mic));
- 
- 		offset = SHARED_KEY_ENTRY(key->hw_key_idx);
-+
-+		rt2800_shared_mem_lock(rt2x00dev);
- 		rt2800_register_multiwrite(rt2x00dev, offset,
- 					      &key_entry, sizeof(key_entry));
-+		rt2800_shared_mem_unlock(rt2x00dev);
- 	}
- 
- 	/*
-@@ -1364,10 +1392,12 @@ int rt2800_config_shared_key(struct rt2x
- 
- 	offset = SHARED_KEY_MODE_ENTRY(key->hw_key_idx / 8);
- 
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2800_register_read(rt2x00dev, offset, &reg);
- 	rt2x00_set_field32(&reg, field,
- 			   (crypto->cmd == SET_KEY) * crypto->cipher);
- 	rt2800_register_write(rt2x00dev, offset, reg);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	/*
- 	 * Update WCID information
-@@ -1437,8 +1467,11 @@ int rt2800_config_pairwise_key(struct rt
- 		       sizeof(key_entry.rx_mic));
- 
- 		offset = PAIRWISE_KEY_ENTRY(key->hw_key_idx);
-+
-+		rt2800_shared_mem_lock(rt2x00dev);
- 		rt2800_register_multiwrite(rt2x00dev, offset,
- 					      &key_entry, sizeof(key_entry));
-+		rt2800_shared_mem_unlock(rt2x00dev);
- 	}
- 
- 	/*
-@@ -4901,14 +4934,19 @@ static int rt2800_init_registers(struct 
- 	/*
- 	 * ASIC will keep garbage value after boot, clear encryption keys.
- 	 */
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	for (i = 0; i < 4; i++)
- 		rt2800_register_write(rt2x00dev,
- 					 SHARED_KEY_MODE_ENTRY(i), 0);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	for (i = 0; i < 256; i++) {
- 		rt2800_config_wcid(rt2x00dev, NULL, i);
- 		rt2800_delete_wcid_attr(rt2x00dev, i);
-+
-+		rt2800_shared_mem_lock(rt2x00dev);
- 		rt2800_register_write(rt2x00dev, MAC_IVEIV_ENTRY(i), 0);
-+		rt2800_shared_mem_unlock(rt2x00dev);
- 	}
- 
- 	/*
-@@ -5034,8 +5072,10 @@ static int rt2800_wait_bbp_ready(struct 
- 	 * BBP was enabled after firmware was loaded,
- 	 * but we need to reactivate it now.
- 	 */
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
- 	rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 	msleep(1);
- 
- 	for (i = 0; i < REGISTER_BUSY_COUNT; i++) {
-@@ -6731,11 +6771,19 @@ int rt2800_enable_radio(struct rt2x00_de
- 	/*
- 	 * Send signal during boot time to initialize firmware.
- 	 */
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
- 	rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
--	if (rt2x00_is_usb(rt2x00dev))
-+	rt2800_shared_mem_unlock(rt2x00dev);
-+
-+	if (rt2x00_is_usb(rt2x00dev)) {
-+		rt2800_shared_mem_lock(rt2x00dev);
- 		rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
-+		rt2800_shared_mem_unlock(rt2x00dev);
-+	}
-+
- 	rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
-+
- 	msleep(1);
- 
- 	/*
-@@ -7744,6 +7792,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- 	int retval;
- 	u32 reg;
- 
-+	rt2800_shared_mem_init_lock(rt2x00dev);
-+
- 	retval = rt2800_probe_rt(rt2x00dev);
- 	if (retval)
- 		return retval;
-@@ -7823,8 +7873,11 @@ void rt2800_get_tkip_seq(struct ieee8021
- 	u32 offset;
- 
- 	offset = MAC_IVEIV_ENTRY(hw_key_idx);
-+
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2800_register_multiread(rt2x00dev, offset,
- 				      &iveiv_entry, sizeof(iveiv_entry));
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	memcpy(iv16, &iveiv_entry.iv[0], sizeof(*iv16));
- 	memcpy(iv32, &iveiv_entry.iv[4], sizeof(*iv32));
---- a/drivers/net/wireless/rt2x00/rt2800lib.h
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
-@@ -35,6 +35,11 @@ struct rt2800_drv_data {
- 	unsigned int tbtt_tick;
- 
- 	unsigned long rt2800_flags;
-+
-+	union {
-+		spinlock_t spin;
-+		struct mutex mutex;
-+	} shmem_lock;
- };
- 
- struct rt2800_ops {
-@@ -65,6 +70,10 @@ struct rt2800_ops {
- 				  const u8 *data, const size_t len);
- 	int (*drv_init_registers)(struct rt2x00_dev *rt2x00dev);
- 	__le32 *(*drv_get_txwi)(struct queue_entry *entry);
-+
-+	void (*shmem_init_lock)(struct rt2x00_dev *rt2x00dev);
-+	void (*shmem_lock)(struct rt2x00_dev *rt2x00dev);
-+	void (*shmem_unlock)(struct rt2x00_dev *rt2x00dev);
- };
- 
- static inline bool rt2800_has_high_shared_mem(struct rt2x00_dev *rt2x00dev)
-@@ -74,6 +83,29 @@ static inline bool rt2800_has_high_share
- 	return test_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
- }
- 
-+static inline void rt2800_shared_mem_init_lock(struct rt2x00_dev *rt2x00dev)
-+{
-+	const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
-+
-+	rt2800ops->shmem_init_lock(rt2x00dev);
-+}
-+
-+static inline void rt2800_shared_mem_lock(struct rt2x00_dev *rt2x00dev)
-+{
-+	const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
-+
-+	if (rt2800_has_high_shared_mem(rt2x00dev))
-+		rt2800ops->shmem_lock(rt2x00dev);
-+}
-+
-+static inline void rt2800_shared_mem_unlock(struct rt2x00_dev *rt2x00dev)
-+{
-+	const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
-+
-+	if (rt2800_has_high_shared_mem(rt2x00dev))
-+		rt2800ops->shmem_unlock(rt2x00dev);
-+}
-+
- static inline void rt2800_register_read(struct rt2x00_dev *rt2x00dev,
- 					const unsigned int offset,
- 					u32 *value)
---- a/drivers/net/wireless/rt2x00/rt2800mmio.c
-+++ b/drivers/net/wireless/rt2x00/rt2800mmio.c
-@@ -820,8 +820,10 @@ int rt2800mmio_init_registers(struct rt2
- 	rt2x00_set_field32(&reg, WPDMA_RST_IDX_DRX_IDX0, 1);
- 	rt2x00mmio_register_write(rt2x00dev, WPDMA_RST_IDX, reg);
- 
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e1f);
- 	rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00000e00);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	if (rt2x00_is_pcie(rt2x00dev) &&
- 	    (rt2x00_rt(rt2x00dev, RT3090) ||
-@@ -865,6 +867,30 @@ int rt2800mmio_enable_radio(struct rt2x0
- }
- EXPORT_SYMBOL_GPL(rt2800mmio_enable_radio);
- 
-+void rt2800mmio_shmem_init_lock(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+
-+	spin_lock_init(&drv_data->shmem_lock.spin);
-+}
-+EXPORT_SYMBOL_GPL(rt2800mmio_shmem_init_lock);
-+
-+void rt2800mmio_shmem_lock(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+
-+	spin_lock_bh(&drv_data->shmem_lock.spin);
-+}
-+EXPORT_SYMBOL_GPL(rt2800mmio_shmem_lock);
-+
-+void rt2800mmio_shmem_unlock(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+
-+	spin_unlock_bh(&drv_data->shmem_lock.spin);
-+}
-+EXPORT_SYMBOL_GPL(rt2800mmio_shmem_unlock);
-+
- MODULE_AUTHOR(DRV_PROJECT);
- MODULE_VERSION(DRV_VERSION);
- MODULE_DESCRIPTION("rt2800 MMIO library");
---- a/drivers/net/wireless/rt2x00/rt2800mmio.h
-+++ b/drivers/net/wireless/rt2x00/rt2800mmio.h
-@@ -160,4 +160,8 @@ int rt2800mmio_init_registers(struct rt2
- /* Device state switch handlers. */
- int rt2800mmio_enable_radio(struct rt2x00_dev *rt2x00dev);
- 
-+void rt2800mmio_shmem_init_lock(struct rt2x00_dev *rt2x00dev);
-+void rt2800mmio_shmem_lock(struct rt2x00_dev *rt2x00dev);
-+void rt2800mmio_shmem_unlock(struct rt2x00_dev *rt2x00dev);
-+
- #endif /* RT2800MMIO_H */
---- a/drivers/net/wireless/rt2x00/rt2800pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -69,7 +69,9 @@ static void rt2800pci_mcu_status(struct 
- 		return;
- 
- 	for (i = 0; i < 200; i++) {
-+		rt2800_shared_mem_lock(rt2x00dev);
- 		rt2x00mmio_register_read(rt2x00dev, H2M_MAILBOX_CID, &reg);
-+		rt2800_shared_mem_unlock(rt2x00dev);
- 
- 		if ((rt2x00_get_field32(reg, H2M_MAILBOX_CID_CMD0) == token) ||
- 		    (rt2x00_get_field32(reg, H2M_MAILBOX_CID_CMD1) == token) ||
-@@ -83,8 +85,10 @@ static void rt2800pci_mcu_status(struct 
- 	if (i == 200)
- 		rt2x00_err(rt2x00dev, "MCU request failed, no response from hardware\n");
- 
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
- 	rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- }
- 
- static void rt2800pci_eepromregister_read(struct eeprom_93cx6 *eeprom)
-@@ -184,6 +188,8 @@ static int rt2800pci_write_firmware(stru
- 	 */
- 	reg = 0;
- 	rt2x00_set_field32(&reg, PBF_SYS_CTRL_HOST_RAM_WRITE, 1);
-+
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2x00mmio_register_write(rt2x00dev, PBF_SYS_CTRL, reg);
- 
- 	/*
-@@ -197,6 +203,7 @@ static int rt2800pci_write_firmware(stru
- 
- 	rt2x00mmio_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
- 	rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	return 0;
- }
-@@ -213,8 +220,10 @@ static int rt2800pci_enable_radio(struct
- 		return retval;
- 
- 	/* After resume MCU_BOOT_SIGNAL will trash these. */
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
- 	rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	rt2800_mcu_request(rt2x00dev, MCU_SLEEP, TOKEN_RADIO_OFF, 0xff, 0x02);
- 	rt2800pci_mcu_status(rt2x00dev, TOKEN_RADIO_OFF);
-@@ -233,10 +242,12 @@ static int rt2800pci_set_state(struct rt
- 				   0, 0x02);
- 		rt2800pci_mcu_status(rt2x00dev, TOKEN_WAKEUP);
- 	} else if (state == STATE_SLEEP) {
-+		rt2800_shared_mem_lock(rt2x00dev);
- 		rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_STATUS,
- 					  0xffffffff);
- 		rt2x00mmio_register_write(rt2x00dev, H2M_MAILBOX_CID,
- 					  0xffffffff);
-+		rt2800_shared_mem_unlock(rt2x00dev);
- 		rt2800_mcu_request(rt2x00dev, MCU_SLEEP, TOKEN_SLEEP,
- 				   0xff, 0x01);
- 	}
-@@ -337,6 +348,9 @@ static const struct rt2800_ops rt2800pci
- 	.drv_write_firmware	= rt2800pci_write_firmware,
- 	.drv_init_registers	= rt2800mmio_init_registers,
- 	.drv_get_txwi		= rt2800mmio_get_txwi,
-+	.shmem_init_lock	= rt2800mmio_shmem_init_lock,
-+	.shmem_lock		= rt2800mmio_shmem_lock,
-+	.shmem_unlock		= rt2800mmio_shmem_unlock,
- };
- 
- static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = {
---- a/drivers/net/wireless/rt2x00/rt2800soc.c
-+++ b/drivers/net/wireless/rt2x00/rt2800soc.c
-@@ -176,6 +176,9 @@ static const struct rt2800_ops rt2800soc
- 	.drv_write_firmware	= rt2800soc_write_firmware,
- 	.drv_init_registers	= rt2800mmio_init_registers,
- 	.drv_get_txwi		= rt2800mmio_get_txwi,
-+	.shmem_init_lock	= rt2800mmio_shmem_init_lock,
-+	.shmem_lock		= rt2800mmio_shmem_lock,
-+	.shmem_unlock		= rt2800mmio_shmem_unlock,
- };
- 
- static const struct rt2x00lib_ops rt2800soc_rt2x00_ops = {
---- a/drivers/net/wireless/rt2x00/rt2800usb.c
-+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -51,6 +51,27 @@ static bool rt2800usb_hwcrypt_disabled(s
- 	return modparam_nohwcrypt;
- }
- 
-+static void rt2800usb_shmem_init_lock(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+
-+	mutex_init(&drv_data->shmem_lock.mutex);
-+}
-+
-+static void rt2800usb_shmem_lock(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+
-+	mutex_lock(&drv_data->shmem_lock.mutex);
-+}
-+
-+static void rt2800usb_shmem_unlock(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+
-+	mutex_unlock(&drv_data->shmem_lock.mutex);
-+}
-+
- /*
-  * Queue handlers.
-  */
-@@ -294,8 +315,10 @@ static int rt2800usb_write_firmware(stru
- 					      data + offset, length);
- 	}
- 
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
- 	rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	/*
- 	 * Send firmware request to device to load firmware,
-@@ -310,7 +333,10 @@ static int rt2800usb_write_firmware(stru
- 	}
- 
- 	msleep(10);
-+
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	return 0;
- }
-@@ -328,8 +354,10 @@ static int rt2800usb_init_registers(stru
- 	if (rt2800_wait_csr_ready(rt2x00dev))
- 		return -EBUSY;
- 
-+	rt2800_shared_mem_lock(rt2x00dev);
- 	rt2x00usb_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
- 	rt2x00usb_register_write(rt2x00dev, PBF_SYS_CTRL, reg & ~0x00002000);
-+	rt2800_shared_mem_unlock(rt2x00dev);
- 
- 	reg = 0;
- 	rt2x00_set_field32(&reg, MAC_SYS_CTRL_RESET_CSR, 1);
-@@ -859,6 +887,9 @@ static const struct rt2800_ops rt2800usb
- 	.drv_write_firmware	= rt2800usb_write_firmware,
- 	.drv_init_registers	= rt2800usb_init_registers,
- 	.drv_get_txwi		= rt2800usb_get_txwi,
-+	.shmem_init_lock	= rt2800usb_shmem_init_lock,
-+	.shmem_lock		= rt2800usb_shmem_lock,
-+	.shmem_unlock		= rt2800usb_shmem_unlock,
- };
- 
- static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {

package/kernel/mac80211/patches/600-0004-rt2x00-rt2800lib-fix-beacon-generation-on-RT3593.patch

@@ -1,131 +0,0 @@
-From dcfe3dd46242050f100162dce2bcad24d2c942c6 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sat, 17 Aug 2013 19:31:42 +0200
-Subject: [PATCH] rt2x00: rt2800lib: fix beacon generation on RT3593
-
-On the RT3593 chipset, the beacon registers are located
-in the high 8KB part of the shared memory.
-
-The high part of the shared memory is only accessible
-if it is explicitly selected. Add a helper function
-in order to be able to control the SHR_MSEL bit in
-the PBF_SYS_CTRL register. Also add a few more helper
-functions and use those to select the correct part of
-the shared memory before and after accessing the beacon
-registers.
-
-The base addresses of the beacon registers are also
-different from the actually used values, so fix the
-'rt2800_hw_beacon_base' function to return the correct
-values.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
-Changes since v1: ---
----
- drivers/net/wireless/rt2x00/rt2800.h    |    3 +++
- drivers/net/wireless/rt2x00/rt2800lib.c |   44 +++++++++++++++++++++++++++++++
- 2 files changed, 47 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -574,6 +574,7 @@
- #define PBF_SYS_CTRL			0x0400
- #define PBF_SYS_CTRL_READY		FIELD32(0x00000080)
- #define PBF_SYS_CTRL_HOST_RAM_WRITE	FIELD32(0x00010000)
-+#define PBF_SYS_CTRL_SHR_MSEL		FIELD32(0x00080000)
- 
- /*
-  * HOST-MCU shared memory
-@@ -2026,6 +2027,8 @@ struct mac_iveiv_entry {
- 	  (((__index) < 6) ? (HW_BEACON_BASE4 + ((__index - 4) * 0x0200)) : \
- 	  (HW_BEACON_BASE6 - ((__index - 6) * 0x0200))))
- 
-+#define HW_BEACON_BASE_HIGH(__index)	(0x4000 + (__index) * 512)
-+
- #define BEACON_BASE_TO_OFFSET(_base)	(((_base) - 0x4000) / 64)
- 
- /*
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -82,6 +82,39 @@ static inline bool rt2800_is_305x_soc(st
- 	return false;
- }
- 
-+static inline void rt2800_shared_mem_select(struct rt2x00_dev *rt2x00dev,
-+					    bool high)
-+{
-+	u32 reg;
-+
-+	if (WARN_ON_ONCE(!rt2800_has_high_shared_mem(rt2x00dev)))
-+		return;
-+
-+	rt2800_register_read(rt2x00dev, PBF_SYS_CTRL, &reg);
-+	rt2x00_set_field32(&reg, PBF_SYS_CTRL_SHR_MSEL, high);
-+	rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, reg);
-+}
-+
-+static inline bool rt2800_beacon_uses_high_mem(struct rt2x00_dev *rt2x00dev)
-+{
-+	if (rt2x00_rt(rt2x00dev, RT3593))
-+		return true;
-+
-+	return false;
-+}
-+
-+static inline void rt2800_select_beacon_mem(struct rt2x00_dev *rt2x00dev)
-+{
-+	if (rt2800_beacon_uses_high_mem(rt2x00dev))
-+		rt2800_shared_mem_select(rt2x00dev, true);
-+}
-+
-+static inline void rt2800_deselect_beacon_mem(struct rt2x00_dev *rt2x00dev)
-+{
-+	if (rt2800_beacon_uses_high_mem(rt2x00dev))
-+		rt2800_shared_mem_select(rt2x00dev, false);
-+}
-+
- static void rt2800_bbp_write(struct rt2x00_dev *rt2x00dev,
- 			     const unsigned int word, const u8 value)
- {
-@@ -948,6 +981,9 @@ EXPORT_SYMBOL_GPL(rt2800_txdone_entry);
- static unsigned int rt2800_hw_beacon_base(struct rt2x00_dev *rt2x00dev,
- 					  unsigned int index)
- {
-+	if (rt2x00_rt(rt2x00dev, RT3593))
-+		return HW_BEACON_BASE_HIGH(index);
-+
- 	return HW_BEACON_BASE(index);
- }
- 
-@@ -1046,8 +1082,12 @@ void rt2800_write_beacon(struct queue_en
- 	beacon_base = rt2800_hw_beacon_base(rt2x00dev, entry->entry_idx);
- 
- 	rt2800_shared_mem_lock(rt2x00dev);
-+
-+	rt2800_select_beacon_mem(rt2x00dev);
- 	rt2800_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data,
- 				   entry->skb->len + padding_len);
-+	rt2800_deselect_beacon_mem(rt2x00dev);
-+
- 	rt2800_shared_mem_unlock(rt2x00dev);
- 	__set_bit(ENTRY_BCN_ENABLED, &entry->flags);
- 
-@@ -1080,6 +1120,8 @@ static inline void rt2800_clear_beacon_r
- 
- 	rt2800_shared_mem_lock(rt2x00dev);
- 
-+	rt2800_select_beacon_mem(rt2x00dev);
-+
- 	/*
- 	 * For the Beacon base registers we only need to clear
- 	 * the whole TXWI which (when set to 0) will invalidate
-@@ -1088,6 +1130,8 @@ static inline void rt2800_clear_beacon_r
- 	for (i = 0; i < txwi_desc_size; i += sizeof(__le32))
- 		rt2800_register_write(rt2x00dev, beacon_base + i, 0);
- 
-+	rt2800_deselect_beacon_mem(rt2x00dev);
-+
- 	rt2800_shared_mem_unlock(rt2x00dev);
- }
- 

package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch

@@ -1,62 +0,0 @@
-From a058825fa7b53fab3b003d8928b60e5b686b3421 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 4 Aug 2013 14:36:11 +0200
-Subject: [PATCH] rt2x00: rt2800lib: add hw_beacon_count field to struct
- rt2800_drv_data
-
-Some chipsets can handle more than 8 beacons at once.
-Add a new field to the rt2800_drv_data structure which
-will hold the number of supported beacons of the given
-chipset.
-
-Update the rt2x00_init_registers function to get the
-beacon count from the new field instead of using a
-hardcoded value.
-
-In order to keep the current behaviour, initialize the
-new field with the actually used value.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    5 ++++-
- drivers/net/wireless/rt2x00/rt2800lib.h |    1 +
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4631,6 +4631,7 @@ EXPORT_SYMBOL_GPL(rt2800_link_tuner);
-  */
- static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
- {
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
- 	u32 reg;
- 	u16 eeprom;
- 	unsigned int i;
-@@ -4996,7 +4997,7 @@ static int rt2800_init_registers(struct 
- 	/*
- 	 * Clear all beacons
- 	 */
--	for (i = 0; i < 8; i++)
-+	for (i = 0; i < drv_data->hw_beacon_count; i++)
- 		rt2800_clear_beacon_register(rt2x00dev, i);
- 
- 	if (rt2x00_is_usb(rt2x00dev)) {
-@@ -7845,6 +7846,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- 	if (rt2x00_rt(rt2x00dev, RT3593))
- 		__set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
- 
-+	drv_data->hw_beacon_count = 8;
-+
- 	/*
- 	 * Allocate eeprom data.
- 	 */
---- a/drivers/net/wireless/rt2x00/rt2800lib.h
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
-@@ -33,6 +33,7 @@ struct rt2800_drv_data {
- 	u8 txmixer_gain_24g;
- 	u8 txmixer_gain_5g;
- 	unsigned int tbtt_tick;
-+	unsigned int hw_beacon_count;
- 
- 	unsigned long rt2800_flags;
- 

package/kernel/mac80211/patches/600-0006-rt2x00-rt2800lib-init-additional-beacon-offset-regis.patch

@@ -1,67 +0,0 @@
-From 1bfa43ca8f30be53ce4fa79cfc3e219642a812b6 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Mon, 2 Sep 2013 10:58:32 +0200
-Subject: [PATCH] rt2x00: rt2800lib: init additional beacon offset registers
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800.h    |   14 ++++++++++++++
- drivers/net/wireless/rt2x00/rt2800lib.c |   24 ++++++++++++++++++++++++
- 2 files changed, 38 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -629,6 +629,20 @@
-  */
- #define PBF_DBG				0x043c
- 
-+/* BCN_OFFSET2 */
-+#define BCN_OFFSET2			0x0444
-+#define BCN_OFFSET2_BCN8		FIELD32(0x000000ff)
-+#define BCN_OFFSET2_BCN9		FIELD32(0x0000ff00)
-+#define BCN_OFFSET2_BCN10		FIELD32(0x00ff0000)
-+#define BCN_OFFSET2_BCN11		FIELD32(0xff000000)
-+
-+/* BCN_OFFSET3 */
-+#define BCN_OFFSET3			0x0448
-+#define BCN_OFFSET3_BCN12		FIELD32(0x000000ff)
-+#define BCN_OFFSET3_BCN13		FIELD32(0x0000ff00)
-+#define BCN_OFFSET3_BCN14		FIELD32(0x00ff0000)
-+#define BCN_OFFSET3_BCN15		FIELD32(0xff000000)
-+
- /*
-  * RF registers
-  */
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4643,6 +4643,30 @@ static int rt2800_init_registers(struct 
- 	if (ret)
- 		return ret;
- 
-+	if (drv_data->hw_beacon_count == 16) {
-+		rt2800_register_read(rt2x00dev, BCN_OFFSET2, &reg);
-+		rt2x00_set_field32(&reg, BCN_OFFSET2_BCN8,
-+				   rt2800_get_beacon_offset(rt2x00dev, 8));
-+		rt2x00_set_field32(&reg, BCN_OFFSET2_BCN9,
-+				   rt2800_get_beacon_offset(rt2x00dev, 9));
-+		rt2x00_set_field32(&reg, BCN_OFFSET2_BCN10,
-+				   rt2800_get_beacon_offset(rt2x00dev, 10));
-+		rt2x00_set_field32(&reg, BCN_OFFSET2_BCN11,
-+				   rt2800_get_beacon_offset(rt2x00dev, 11));
-+		rt2800_register_write(rt2x00dev, BCN_OFFSET2, reg);
-+
-+		rt2800_register_read(rt2x00dev, BCN_OFFSET3, &reg);
-+		rt2x00_set_field32(&reg, BCN_OFFSET3_BCN12,
-+				   rt2800_get_beacon_offset(rt2x00dev, 12));
-+		rt2x00_set_field32(&reg, BCN_OFFSET3_BCN13,
-+				   rt2800_get_beacon_offset(rt2x00dev, 13));
-+		rt2x00_set_field32(&reg, BCN_OFFSET3_BCN14,
-+				   rt2800_get_beacon_offset(rt2x00dev, 14));
-+		rt2x00_set_field32(&reg, BCN_OFFSET3_BCN15,
-+				   rt2800_get_beacon_offset(rt2x00dev, 15));
-+		rt2800_register_write(rt2x00dev, BCN_OFFSET3, reg);
-+	}
-+
- 	rt2800_register_write(rt2x00dev, LEGACY_BASIC_RATE, 0x0000013f);
- 	rt2800_register_write(rt2x00dev, HT_BASIC_RATE, 0x00008003);
- 

package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch

@@ -1,24 +0,0 @@
-From 9bea8b61f6025cd633bd5ac71be258620b49bcb3 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Mon, 2 Sep 2013 11:00:06 +0200
-Subject: [PATCH] rt2x00: rt2800lib: fix max supported beacon count for RT3593
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7870,7 +7870,10 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- 	if (rt2x00_rt(rt2x00dev, RT3593))
- 		__set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
- 
--	drv_data->hw_beacon_count = 8;
-+	if (rt2x00_rt(rt2x00dev, RT3593))
-+		drv_data->hw_beacon_count = 16;
-+	else
-+		drv_data->hw_beacon_count = 8;
- 
- 	/*
- 	 * Allocate eeprom data.

package/kernel/mac80211/patches/600-0008-rt2x00-allow-to-build-rt2800soc-module-for-RT3883.patch

@@ -1,30 +0,0 @@
-From 91094ed065f7794886b4a5490fd6de942f036bb4 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:26 +0100
-Subject: [PATCH] rt2x00: allow to build rt2800soc module for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/Kconfig |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/Kconfig
-+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -210,7 +210,7 @@ endif
- config RT2800SOC
- 	tristate "Ralink WiSoC support"
- 	depends on m
--	depends on SOC_RT288X || SOC_RT305X
-+	depends on SOC_RT288X || SOC_RT305X || SOC_RT3883
- 	select RT2X00_LIB_SOC
- 	select RT2X00_LIB_MMIO
- 	select RT2X00_LIB_CRYPTO
-@@ -245,7 +245,7 @@ config RT2X00_LIB_PCI
- 
- config RT2X00_LIB_SOC
- 	tristate "RT2x00 SoC support"
--	depends on SOC_RT288X || SOC_RT305X
-+	depends on SOC_RT288X || SOC_RT305X || SOC_RT3883
- 	depends on m
- 	select RT2X00_LIB
- 

package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch

@@ -1,20 +0,0 @@
-From 4f16582c93a71eba9d389e0f0a8aa9099a9587cd Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:26 +0100
-Subject: [PATCH] rt2x00: rt2800lib: enable support for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7840,6 +7840,7 @@ static int rt2800_probe_rt(struct rt2x00
- 	case RT3390:
- 	case RT3572:
- 	case RT3593:
-+	case RT3883:
- 	case RT5390:
- 	case RT5392:
- 	case RT5592:

package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch

@@ -1,112 +0,0 @@
-From ecb394ccf248d8652c463133c4f404458a57a9c1 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:26 +0100
-Subject: [PATCH] rt2x00: rt2800lib: add rf_vals for RF3853
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800.h    |    4 +-
- drivers/net/wireless/rt2x00/rt2800lib.c |   65 +++++++++++++++++++++++++++++++
- 2 files changed, 68 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -48,7 +48,8 @@
-  * RF2853 2.4G/5G 3T3R
-  * RF3320 2.4G 1T1R(RT3350/RT3370/RT3390)
-  * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392)
-- * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)
-+ * RF3053 2.4G/5G 3T3R(RT3563/RT3573/RT3593)
-+ * RF3853 2.4G/5G 3T3R(RT3883/RT3662)
-  * RF5592 2.4G/5G 2T2R
-  * RF3070 2.4G 1T1R
-  * RF5360 2.4G 1T1R
-@@ -72,6 +73,7 @@
- #define RF5592				0x000f
- #define RF3070				0x3070
- #define RF3290				0x3290
-+#define RF3853				0x3853
- #define RF5360				0x5360
- #define RF5362				0x5362
- #define RF5370				0x5370
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7458,6 +7458,66 @@ static const struct rf_channel rf_vals_3
- 	{173, 0x61, 0, 9},
- };
- 
-+static const struct rf_channel rf_vals_3853[] = {
-+	{1,  241, 6, 2},
-+	{2,  241, 6, 7},
-+	{3,  242, 6, 2},
-+	{4,  242, 6, 7},
-+	{5,  243, 6, 2},
-+	{6,  243, 6, 7},
-+	{7,  244, 6, 2},
-+	{8,  244, 6, 7},
-+	{9,  245, 6, 2},
-+	{10, 245, 6, 7},
-+	{11, 246, 6, 2},
-+	{12, 246, 6, 7},
-+	{13, 247, 6, 2},
-+	{14, 248, 6, 4},
-+
-+	{36, 0x56, 8, 4},
-+	{38, 0x56, 8, 6},
-+	{40, 0x56, 8, 8},
-+	{44, 0x57, 8, 0},
-+	{46, 0x57, 8, 2},
-+	{48, 0x57, 8, 4},
-+	{52, 0x57, 8, 8},
-+	{54, 0x57, 8, 10},
-+	{56, 0x58, 8, 0},
-+	{60, 0x58, 8, 4},
-+	{62, 0x58, 8, 6},
-+	{64, 0x58, 8, 8},
-+
-+	{100, 0x5b, 8, 8},
-+	{102, 0x5b, 8, 10},
-+	{104, 0x5c, 8, 0},
-+	{108, 0x5c, 8, 4},
-+	{110, 0x5c, 8, 6},
-+	{112, 0x5c, 8, 8},
-+	{114, 0x5c, 8, 10},
-+	{116, 0x5d, 8, 0},
-+	{118, 0x5d, 8, 2},
-+	{120, 0x5d, 8, 4},
-+	{124, 0x5d, 8, 8},
-+	{126, 0x5d, 8, 10},
-+	{128, 0x5e, 8, 0},
-+	{132, 0x5e, 8, 4},
-+	{134, 0x5e, 8, 6},
-+	{136, 0x5e, 8, 8},
-+	{140, 0x5f, 8, 0},
-+
-+	{149, 0x5f, 8, 9},
-+	{151, 0x5f, 8, 11},
-+	{153, 0x60, 8, 1},
-+	{157, 0x60, 8, 5},
-+	{159, 0x60, 8, 7},
-+	{161, 0x60, 8, 9},
-+	{165, 0x61, 8, 1},
-+	{167, 0x61, 8, 3},
-+	{169, 0x61, 8, 5},
-+	{171, 0x61, 8, 7},
-+	{173, 0x61, 8, 9},
-+};
-+
- static const struct rf_channel rf_vals_5592_xtal20[] = {
- 	/* Channel, N, K, mod, R */
- 	{1, 482, 4, 10, 3},
-@@ -7687,6 +7747,11 @@ static int rt2800_probe_hw_mode(struct r
- 		spec->channels = rf_vals_3x;
- 		break;
- 
-+	case RF3853:
-+		spec->num_channels = ARRAY_SIZE(rf_vals_3853);
-+		spec->channels = rf_vals_3853;
-+		break;
-+
- 	case RF5592:
- 		rt2800_register_read(rt2x00dev, MAC_DEBUG_INDEX, &reg);
- 		if (rt2x00_get_field32(reg, MAC_DEBUG_INDEX_XTAL)) {

package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch

@@ -1,28 +0,0 @@
-From f8e3fcf18e1f2d7f9e6a9680c5452da090f33d88 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Thu, 1 Aug 2013 14:40:44 +0200
-Subject: [PATCH] rt2x00: rt2800lib: enable VCO calibration for RF3853
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4395,6 +4395,7 @@ void rt2800_vco_calibration(struct rt2x0
- 	case RF3053:
- 	case RF3070:
- 	case RF3290:
-+	case RF3853:
- 	case RF5360:
- 	case RF5362:
- 	case RF5370:
-@@ -7866,6 +7867,7 @@ static int rt2800_probe_hw_mode(struct r
- 	case RF3053:
- 	case RF3070:
- 	case RF3290:
-+	case RF3853:
- 	case RF5360:
- 	case RF5362:
- 	case RF5370:

package/kernel/mac80211/patches/600-0012-rt2x00-rt2800lib-add-channel-configuration-function-.patch

@@ -1,235 +0,0 @@
-From 6e3a17190815c6aa4dc53c2cfe9125fb1154f187 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:27 +0100
-Subject: [PATCH] rt2x00: rt2800lib: add channel configuration function for
- RF3853
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |  208 +++++++++++++++++++++++++++++++
- 1 file changed, 208 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -2649,6 +2649,211 @@ static void rt2800_config_channel_rf3053
- 	}
- }
- 
-+static void rt2800_config_channel_rf3853(struct rt2x00_dev *rt2x00dev,
-+					 struct ieee80211_conf *conf,
-+					 struct rf_channel *rf,
-+					 struct channel_info *info)
-+{
-+	u8 rfcsr;
-+	u8 bbp;
-+	u8 pwr1, pwr2, pwr3;
-+
-+	const bool txbf_enabled = false; /* TODO */
-+
-+	/* TODO: add band selection */
-+
-+	if (rf->channel <= 14)
-+		rt2800_rfcsr_write(rt2x00dev, 6, 0x40);
-+	else if (rf->channel < 132)
-+		rt2800_rfcsr_write(rt2x00dev, 6, 0x80);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 6, 0x40);
-+
-+	rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
-+	rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
-+
-+	if (rf->channel <= 14)
-+		rt2800_rfcsr_write(rt2x00dev, 11, 0x46);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 11, 0x48);
-+
-+	if (rf->channel <= 14)
-+		rt2800_rfcsr_write(rt2x00dev, 12, 0x1a);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 12, 0x52);
-+
-+	rt2800_rfcsr_write(rt2x00dev, 13, 0x12);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
-+	rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 0);
-+	rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 0);
-+	rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 0);
-+	rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 0);
-+	rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD, 0);
-+	rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD, 0);
-+	rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
-+	rt2x00_set_field8(&rfcsr, RFCSR1_PLL_PD, 1);
-+
-+	switch (rt2x00dev->default_ant.tx_chain_num) {
-+	case 3:
-+		rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD, 1);
-+		/* fallthrough */
-+	case 2:
-+		rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
-+		/* fallthrough */
-+	case 1:
-+		rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 1);
-+		break;
-+	}
-+
-+	switch (rt2x00dev->default_ant.rx_chain_num) {
-+	case 3:
-+		rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD, 1);
-+		/* fallthrough */
-+	case 2:
-+		rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
-+		/* fallthrough */
-+	case 1:
-+		rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 1);
-+		break;
-+	}
-+	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
-+
-+	rt2800_adjust_freq_offset(rt2x00dev);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
-+	if (!conf_is_ht40(conf))
-+		rfcsr &= ~(0x06);
-+	else
-+		rfcsr |= 0x06;
-+	rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
-+
-+	if (rf->channel <= 14)
-+		rt2800_rfcsr_write(rt2x00dev, 31, 0xa0);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
-+
-+	if (conf_is_ht40(conf))
-+		rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 32, 0xd8);
-+
-+	if (rf->channel <= 14)
-+		rt2800_rfcsr_write(rt2x00dev, 34, 0x3c);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 34, 0x20);
-+
-+	/* loopback RF_BS */
-+	rt2800_rfcsr_read(rt2x00dev, 36, &rfcsr);
-+	if (rf->channel <= 14)
-+		rt2x00_set_field8(&rfcsr, RFCSR36_RF_BS, 1);
-+	else
-+		rt2x00_set_field8(&rfcsr, RFCSR36_RF_BS, 0);
-+	rt2800_rfcsr_write(rt2x00dev, 36, rfcsr);
-+
-+	if (rf->channel <= 14)
-+		rfcsr = 0x23;
-+	else if (rf->channel < 100)
-+		rfcsr = 0x36;
-+	else if (rf->channel < 132)
-+		rfcsr = 0x32;
-+	else
-+		rfcsr = 0x30;
-+
-+	if (txbf_enabled)
-+		rfcsr |= 0x40;
-+
-+	rt2800_rfcsr_write(rt2x00dev, 39, rfcsr);
-+
-+	if (rf->channel <= 14)
-+		rt2800_rfcsr_write(rt2x00dev, 44, 0x93);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 44, 0x9b);
-+
-+	if (rf->channel <= 14)
-+		rfcsr = 0xbb;
-+	else if (rf->channel < 100)
-+		rfcsr = 0xeb;
-+	else if (rf->channel < 132)
-+		rfcsr = 0xb3;
-+	else
-+		rfcsr = 0x9b;
-+	rt2800_rfcsr_write(rt2x00dev, 45, rfcsr);
-+
-+	if (rf->channel <= 14)
-+		rfcsr = 0x8e;
-+	else
-+		rfcsr = 0x8a;
-+
-+	if (txbf_enabled)
-+		rfcsr |= 0x20;
-+
-+	rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
-+
-+	rt2800_rfcsr_write(rt2x00dev, 50, 0x86);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 51, &rfcsr);
-+	if (rf->channel <= 14)
-+		rt2800_rfcsr_write(rt2x00dev, 51, 0x75);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 51, 0x51);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 52, &rfcsr);
-+	if (rf->channel <= 14)
-+		rt2800_rfcsr_write(rt2x00dev, 52, 0x45);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 52, 0x05);
-+
-+	if (rf->channel <= 14) {
-+		pwr1 = info->default_power1 & 0x1f;
-+		pwr2 = info->default_power2 & 0x1f;
-+		pwr3 = info->default_power3 & 0x1f;
-+	} else {
-+		pwr1 = 0x48 | ((info->default_power1 & 0x18) << 1) |
-+			(info->default_power1 & 0x7);
-+		pwr2 = 0x48 | ((info->default_power2 & 0x18) << 1) |
-+			(info->default_power2 & 0x7);
-+		pwr3 = 0x48 | ((info->default_power3 & 0x18) << 1) |
-+			(info->default_power3 & 0x7);
-+	}
-+
-+	rt2800_rfcsr_write(rt2x00dev, 53, pwr1);
-+	rt2800_rfcsr_write(rt2x00dev, 54, pwr2);
-+	rt2800_rfcsr_write(rt2x00dev, 55, pwr3);
-+
-+	rt2x00_dbg(rt2x00dev, "Channel:%d, pwr1:%02x, pwr2:%02x, pwr3:%02x\n",
-+		   rf->channel, pwr1, pwr2, pwr3);
-+
-+	bbp = (info->default_power1 >> 5) |
-+	      ((info->default_power2 & 0xe0) >> 1);
-+	rt2800_bbp_write(rt2x00dev, 109, bbp);
-+
-+	rt2800_bbp_read(rt2x00dev, 110, &bbp);
-+	bbp &= 0x0f;
-+	bbp |= (info->default_power3 & 0xe0) >> 1;
-+	rt2800_bbp_write(rt2x00dev, 110, bbp);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 57, &rfcsr);
-+	if (rf->channel <= 14)
-+		rt2800_rfcsr_write(rt2x00dev, 57, 0x6e);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 57, 0x3e);
-+
-+	/* Enable RF tuning */
-+	rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);
-+	rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
-+	rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
-+
-+	udelay(2000);
-+
-+	rt2800_bbp_read(rt2x00dev, 49, &bbp);
-+	/* clear update flag */
-+	rt2800_bbp_write(rt2x00dev, 49, bbp & 0xfe);
-+	rt2800_bbp_write(rt2x00dev, 49, bbp);
-+
-+	/* TODO: add calibration for TxBF */
-+}
-+
- #define POWER_BOUND		0x27
- #define POWER_BOUND_5G		0x2b
- 
-@@ -3261,6 +3466,9 @@ static void rt2800_config_channel(struct
- 	case RF3322:
- 		rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);
- 		break;
-+	case RF3853:
-+		rt2800_config_channel_rf3853(rt2x00dev, conf, rf, info);
-+		break;
- 	case RF3070:
- 	case RF5360:
- 	case RF5362:

package/kernel/mac80211/patches/600-0013-rt2x00-rt2800lib-enable-RF3853-support.patch

@@ -1,20 +0,0 @@
-From afd38ae82226551bf879b6c7c4b620c271fee9d2 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Thu, 1 Aug 2013 14:42:05 +0200
-Subject: [PATCH] rt2x00: rt2800lib: enable RF3853 support
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7423,6 +7423,7 @@ static int rt2800_init_eeprom(struct rt2
- 	case RF3290:
- 	case RF3320:
- 	case RF3322:
-+	case RF3853:
- 	case RF5360:
- 	case RF5362:
- 	case RF5370:

package/kernel/mac80211/patches/600-0014-rt2x00-rt2800lib-add-MAC-register-initialization-for.patch

@@ -1,77 +0,0 @@
-From 0094872a5e8e4664c6ea1b2dfa487063d39ae363 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:26 +0100
-Subject: [PATCH] rt2x00: rt2800lib: add MAC register initialization for
- RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800.h    |   14 ++++++++++++++
- drivers/net/wireless/rt2x00/rt2800lib.c |   19 ++++++++++++++++---
- 2 files changed, 30 insertions(+), 3 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -1588,6 +1588,20 @@
- #define TX_PWR_CFG_9_STBC7_CH2		FIELD32(0x00000f00)
- 
- /*
-+ * TX_TXBF_CFG:
-+ */
-+#define TX_TXBF_CFG_0			0x138c
-+#define TX_TXBF_CFG_1			0x13a4
-+#define TX_TXBF_CFG_2			0x13a8
-+#define TX_TXBF_CFG_3			0x13ac
-+
-+/*
-+ * TX_FBK_CFG_3S:
-+ */
-+#define TX_FBK_CFG_3S_0			0x13c4
-+#define TX_FBK_CFG_3S_1			0x13c8
-+
-+/*
-  * RX_FILTER_CFG: RX configuration register.
-  */
- #define RX_FILTER_CFG			0x1400
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4998,6 +4998,12 @@ static int rt2800_init_registers(struct 
- 			rt2800_register_write(rt2x00dev, TX_SW_CFG2,
- 					      0x00000000);
- 		}
-+	} else if (rt2x00_rt(rt2x00dev, RT3883)) {
-+		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000402);
-+		rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);
-+		rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00040000);
-+		rt2800_register_write(rt2x00dev, TX_TXBF_CFG_0, 0x8000fc21);
-+		rt2800_register_write(rt2x00dev, TX_TXBF_CFG_3, 0x00009c40);
- 	} else if (rt2x00_rt(rt2x00dev, RT5390) ||
- 		   rt2x00_rt(rt2x00dev, RT5392) ||
- 		   rt2x00_rt(rt2x00dev, RT5592)) {
-@@ -5028,9 +5034,11 @@ static int rt2800_init_registers(struct 
- 
- 	rt2800_register_read(rt2x00dev, MAX_LEN_CFG, &reg);
- 	rt2x00_set_field32(&reg, MAX_LEN_CFG_MAX_MPDU, AGGREGATION_SIZE);
--	if (rt2x00_rt_rev_gte(rt2x00dev, RT2872, REV_RT2872E) ||
--	    rt2x00_rt(rt2x00dev, RT2883) ||
--	    rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070E))
-+	if (rt2x00_rt(rt2x00dev, RT3883))
-+		rt2x00_set_field32(&reg, MAX_LEN_CFG_MAX_PSDU, 3);
-+	else if (rt2x00_rt_rev_gte(rt2x00dev, RT2872, REV_RT2872E) ||
-+		 rt2x00_rt(rt2x00dev, RT2883) ||
-+		 rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070E))
- 		rt2x00_set_field32(&reg, MAX_LEN_CFG_MAX_PSDU, 2);
- 	else
- 		rt2x00_set_field32(&reg, MAX_LEN_CFG_MAX_PSDU, 1);
-@@ -5183,6 +5191,11 @@ static int rt2800_init_registers(struct 
- 	reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
- 	rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
- 
-+	if (rt2x00_rt(rt2x00dev, RT3883)) {
-+		rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_0, 0x12111008);
-+		rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_1, 0x16151413);
-+	}
-+
- 	rt2800_register_read(rt2x00dev, TX_RTS_CFG, &reg);
- 	rt2x00_set_field32(&reg, TX_RTS_CFG_AUTO_RTS_RETRY_LIMIT, 32);
- 	rt2x00_set_field32(&reg, TX_RTS_CFG_RTS_THRES,

package/kernel/mac80211/patches/600-0015-rt2x00-rt2800soc-fix-rt2800soc_disable_radio-for-RT3.patch

@@ -1,30 +0,0 @@
-From 6c2d32478159fffff0b85abb6817a21bb2338231 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:27 +0100
-Subject: [PATCH] rt2x00: rt2800soc: fix rt2800soc_disable_radio for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800soc.c |    9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800soc.c
-+++ b/drivers/net/wireless/rt2x00/rt2800soc.c
-@@ -51,9 +51,16 @@ static bool rt2800soc_hwcrypt_disabled(s
- 
- static void rt2800soc_disable_radio(struct rt2x00_dev *rt2x00dev)
- {
-+	u32 reg;
-+
- 	rt2800_disable_radio(rt2x00dev);
- 	rt2x00mmio_register_write(rt2x00dev, PWR_PIN_CFG, 0);
--	rt2x00mmio_register_write(rt2x00dev, TX_PIN_CFG, 0);
-+
-+	reg = 0;
-+	if (rt2x00_rt(rt2x00dev, RT3883))
-+		rt2x00_set_field32(&reg, TX_PIN_CFG_RFTR_EN, 1);
-+
-+	rt2x00mmio_register_write(rt2x00dev, TX_PIN_CFG, reg);
- }
- 
- static int rt2800soc_set_device_state(struct rt2x00_dev *rt2x00dev,

package/kernel/mac80211/patches/600-0016-rt2x00-rt2800lib-add-BBP-register-initialization-for.patch

@@ -1,71 +0,0 @@
-From 84833056aa7dd25f5b097e31c78f2a0914c5160c Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:26 +0100
-Subject: [PATCH] rt2x00: rt2800lib: add BBP register initialization for
- RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |   44 +++++++++++++++++++++++++++++++
- 1 file changed, 44 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -5801,6 +5801,47 @@ static void rt2800_init_bbp_3593(struct 
- 		rt2800_bbp_write(rt2x00dev, 103, 0xc0);
- }
- 
-+static void rt2800_init_bbp_3883(struct rt2x00_dev *rt2x00dev)
-+{
-+	rt2800_init_bbp_early(rt2x00dev);
-+
-+	rt2800_bbp_write(rt2x00dev, 4, 0x50);
-+	rt2800_bbp_write(rt2x00dev, 47, 0x48);
-+
-+	rt2800_bbp_write(rt2x00dev, 86, 0x46);
-+	rt2800_bbp_write(rt2x00dev, 88, 0x90);
-+
-+	rt2800_bbp_write(rt2x00dev, 92, 0x02);
-+
-+	rt2800_bbp_write(rt2x00dev, 103, 0xc0);
-+	rt2800_bbp_write(rt2x00dev, 104, 0x92);
-+	rt2800_bbp_write(rt2x00dev, 105, 0x34);
-+	rt2800_bbp_write(rt2x00dev, 106, 0x12);
-+	rt2800_bbp_write(rt2x00dev, 120, 0x50);
-+	rt2800_bbp_write(rt2x00dev, 137, 0x0f);
-+	rt2800_bbp_write(rt2x00dev, 163, 0x9d);
-+
-+	/* Set ITxBF timeout to 0x9C40=1000msec */
-+	rt2800_bbp_write(rt2x00dev, 179, 0x02);
-+	rt2800_bbp_write(rt2x00dev, 180, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 182, 0x40);
-+	rt2800_bbp_write(rt2x00dev, 180, 0x01);
-+	rt2800_bbp_write(rt2x00dev, 182, 0x9c);
-+
-+	rt2800_bbp_write(rt2x00dev, 179, 0x00);
-+
-+	/* Reprogram the inband interface to put right values in RXWI */
-+	rt2800_bbp_write(rt2x00dev, 142, 0x04);
-+	rt2800_bbp_write(rt2x00dev, 143, 0x3b);
-+	rt2800_bbp_write(rt2x00dev, 142, 0x06);
-+	rt2800_bbp_write(rt2x00dev, 143, 0xa0);
-+	rt2800_bbp_write(rt2x00dev, 142, 0x07);
-+	rt2800_bbp_write(rt2x00dev, 143, 0xa1);
-+	rt2800_bbp_write(rt2x00dev, 142, 0x08);
-+	rt2800_bbp_write(rt2x00dev, 143, 0xa2);
-+	rt2800_bbp_write(rt2x00dev, 148, 0xc8);
-+}
-+
- static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev)
- {
- 	int ant, div_mode;
-@@ -6019,6 +6060,9 @@ static void rt2800_init_bbp(struct rt2x0
- 	case RT3593:
- 		rt2800_init_bbp_3593(rt2x00dev);
- 		return;
-+	case RT3883:
-+		rt2800_init_bbp_3883(rt2x00dev);
-+		return;
- 	case RT5390:
- 	case RT5392:
- 		rt2800_init_bbp_53xx(rt2x00dev);

package/kernel/mac80211/patches/600-0017-rt2x00-rt2800lib-add-RFCSR-initialization-for-RT3883.patch

@@ -1,178 +0,0 @@
-From 99c659cf345640fd0f733cbcaf4583cc2c868ec0 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Mon, 29 Apr 2013 13:21:48 +0200
-Subject: [PATCH] rt2x00: rt2800lib: add RFCSR initialization for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800.h    |    1 +
- drivers/net/wireless/rt2x00/rt2800lib.c |  141 +++++++++++++++++++++++++++++++
- 2 files changed, 142 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -2171,6 +2171,7 @@ struct mac_iveiv_entry {
- /*
-  * RFCSR 2:
-  */
-+#define RFCSR2_RESCAL_BP		FIELD8(0x40)
- #define RFCSR2_RESCAL_EN		FIELD8(0x80)
- 
- /*
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -6836,6 +6836,144 @@ static void rt2800_init_rfcsr_3593(struc
- 	/* TODO: enable stream mode support */
- }
- 
-+static void rt2800_init_rfcsr_3883(struct rt2x00_dev *rt2x00dev)
-+{
-+	u8 rfcsr;
-+
-+	/* TODO: get the actual ECO value from the SoC */
-+	const unsigned int eco = 5;
-+
-+	rt2800_rf_init_calibration(rt2x00dev, 2);
-+
-+	rt2800_rfcsr_write(rt2x00dev, 0, 0xe0);
-+	rt2800_rfcsr_write(rt2x00dev, 1, 0x03);
-+	rt2800_rfcsr_write(rt2x00dev, 2, 0x50);
-+	rt2800_rfcsr_write(rt2x00dev, 3, 0x20);
-+	rt2800_rfcsr_write(rt2x00dev, 4, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 5, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 6, 0x40);
-+	rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 8, 0x5b);
-+	rt2800_rfcsr_write(rt2x00dev, 9, 0x08);
-+	rt2800_rfcsr_write(rt2x00dev, 10, 0xd3);
-+	rt2800_rfcsr_write(rt2x00dev, 11, 0x48);
-+	rt2800_rfcsr_write(rt2x00dev, 12, 0x1a);
-+	rt2800_rfcsr_write(rt2x00dev, 13, 0x12);
-+	rt2800_rfcsr_write(rt2x00dev, 14, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 16, 0x00);
-+
-+	/* RFCSR 17 will be initialized later based on the
-+	 * frequency offset stored in the EEPROM
-+	 */
-+
-+	rt2800_rfcsr_write(rt2x00dev, 18, 0x40);
-+	rt2800_rfcsr_write(rt2x00dev, 19, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 21, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
-+	rt2800_rfcsr_write(rt2x00dev, 23, 0xc0);
-+	rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 25, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 26, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 29, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
-+	rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
-+	rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
-+	rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 34, 0x20);
-+	rt2800_rfcsr_write(rt2x00dev, 35, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 37, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 38, 0x86);
-+	rt2800_rfcsr_write(rt2x00dev, 39, 0x23);
-+	rt2800_rfcsr_write(rt2x00dev, 40, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 41, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 42, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 43, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 44, 0x93);
-+	rt2800_rfcsr_write(rt2x00dev, 45, 0xbb);
-+	rt2800_rfcsr_write(rt2x00dev, 46, 0x60);
-+	rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 48, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 49, 0x8e);
-+	rt2800_rfcsr_write(rt2x00dev, 50, 0x86);
-+	rt2800_rfcsr_write(rt2x00dev, 51, 0x51);
-+	rt2800_rfcsr_write(rt2x00dev, 52, 0x05);
-+	rt2800_rfcsr_write(rt2x00dev, 53, 0x76);
-+	rt2800_rfcsr_write(rt2x00dev, 54, 0x76);
-+	rt2800_rfcsr_write(rt2x00dev, 55, 0x76);
-+	rt2800_rfcsr_write(rt2x00dev, 56, 0xdb);
-+	rt2800_rfcsr_write(rt2x00dev, 57, 0x3e);
-+	rt2800_rfcsr_write(rt2x00dev, 58, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
-+
-+	/* TODO: rx filter calibration? */
-+
-+	rt2800_bbp_write(rt2x00dev, 137, 0x0f);
-+
-+	rt2800_bbp_write(rt2x00dev, 163, 0x9d);
-+
-+	rt2800_bbp_write(rt2x00dev, 105, 0x05);
-+
-+	rt2800_bbp_write(rt2x00dev, 179, 0x02);
-+	rt2800_bbp_write(rt2x00dev, 180, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 182, 0x40);
-+	rt2800_bbp_write(rt2x00dev, 180, 0x01);
-+	rt2800_bbp_write(rt2x00dev, 182, 0x9c);
-+
-+	rt2800_bbp_write(rt2x00dev, 179, 0x00);
-+
-+	rt2800_bbp_write(rt2x00dev, 142, 0x04);
-+	rt2800_bbp_write(rt2x00dev, 143, 0x3b);
-+	rt2800_bbp_write(rt2x00dev, 142, 0x06);
-+	rt2800_bbp_write(rt2x00dev, 143, 0xa0);
-+	rt2800_bbp_write(rt2x00dev, 142, 0x07);
-+	rt2800_bbp_write(rt2x00dev, 143, 0xa1);
-+	rt2800_bbp_write(rt2x00dev, 142, 0x08);
-+	rt2800_bbp_write(rt2x00dev, 143, 0xa2);
-+	rt2800_bbp_write(rt2x00dev, 148, 0xc8);
-+
-+	if (eco == 5) {
-+		rt2800_rfcsr_write(rt2x00dev, 32, 0xd8);
-+		rt2800_rfcsr_write(rt2x00dev, 33, 0x32);
-+	}
-+
-+	rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
-+	rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_BP, 0);
-+	rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);
-+	rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
-+	msleep(1);
-+	rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 0);
-+	rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
-+	rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
-+	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 6, &rfcsr);
-+	rfcsr |= 0xc0;
-+	rt2800_rfcsr_write(rt2x00dev, 6, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
-+	rfcsr |= 0x20;
-+	rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 46, &rfcsr);
-+	rfcsr |= 0x20;
-+	rt2800_rfcsr_write(rt2x00dev, 46, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 20, &rfcsr);
-+	rfcsr &= ~0xee;
-+	rt2800_rfcsr_write(rt2x00dev, 20, rfcsr);
-+}
-+
- static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
- {
- 	rt2800_rf_init_calibration(rt2x00dev, 2);
-@@ -7067,6 +7205,9 @@ static void rt2800_init_rfcsr(struct rt2
- 	case RT3390:
- 		rt2800_init_rfcsr_3390(rt2x00dev);
- 		break;
-+	case RT3883:
-+		rt2800_init_rfcsr_3883(rt2x00dev);
-+		break;
- 	case RT3572:
- 		rt2800_init_rfcsr_3572(rt2x00dev);
- 		break;

package/kernel/mac80211/patches/600-0018-rt2x00-rt2800lib-use-the-extended-EEPROM-map-for-RT3.patch

@@ -1,22 +0,0 @@
-From 86022438ffeb1b87dfcd018bf477fdbb43076691 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Wed, 8 May 2013 19:35:33 +0200
-Subject: [PATCH] rt2x00: rt2800lib: use the extended EEPROM map for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -342,7 +342,8 @@ static unsigned int rt2800_eeprom_word_i
- 		      wiphy_name(rt2x00dev->hw->wiphy), word))
- 		return 0;
- 
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		map = rt2800_eeprom_map_ext;
- 	else
- 		map = rt2800_eeprom_map;

package/kernel/mac80211/patches/600-0019-rt2x00-rt2800lib-force-rf-type-to-RF3853-on-RT3883.patch

@@ -1,21 +0,0 @@
-From 4cf5403f02fa65dc2207f61d223cffa9ae50e907 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Thu, 1 Aug 2013 14:48:21 +0200
-Subject: [PATCH] rt2x00: rt2800lib: force rf type to RF3853 on RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7604,6 +7604,8 @@ static int rt2800_init_eeprom(struct rt2
- 	    rt2x00_rt(rt2x00dev, RT5390) ||
- 	    rt2x00_rt(rt2x00dev, RT5392))
- 		rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
-+	else if (rt2x00_rt(rt2x00dev, RT3883))
-+		rf = RF3853;
- 	else
- 		rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
- 

package/kernel/mac80211/patches/600-0020-rt2x00-rt2800lib-add-channel-configuration-code-for-.patch

@@ -1,136 +0,0 @@
-From 269f19c848a2380db03a3f207cafb88e28d71c53 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:28 +0100
-Subject: [PATCH] rt2x00: rt2800lib: add channel configuration code for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |   72 +++++++++++++++++++++++++++++--
- 1 file changed, 69 insertions(+), 3 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -3429,6 +3429,36 @@ static char rt2800_txpower_to_dev(struct
- 		return clamp_t(char, txpower, MIN_A_TXPOWER, MAX_A_TXPOWER);
- }
- 
-+static void rt3883_bbp_adjust(struct rt2x00_dev *rt2x00dev,
-+			      struct rf_channel *rf)
-+{
-+	u8 bbp;
-+
-+	bbp = (rf->channel > 14) ? 0x48 : 0x38;
-+	rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, bbp);
-+
-+	rt2800_bbp_write(rt2x00dev, 69, 0x12);
-+
-+	if (rf->channel <= 14) {
-+		rt2800_bbp_write(rt2x00dev, 70, 0x0a);
-+	} else {
-+		/* Disable CCK packet detection */
-+		rt2800_bbp_write(rt2x00dev, 70, 0x00);
-+	}
-+
-+	rt2800_bbp_write(rt2x00dev, 73, 0x10);
-+
-+	if (rf->channel > 14) {
-+		rt2800_bbp_write(rt2x00dev, 62, 0x1d);
-+		rt2800_bbp_write(rt2x00dev, 63, 0x1d);
-+		rt2800_bbp_write(rt2x00dev, 64, 0x1d);
-+	} else {
-+		rt2800_bbp_write(rt2x00dev, 62, 0x2d);
-+		rt2800_bbp_write(rt2x00dev, 63, 0x2d);
-+		rt2800_bbp_write(rt2x00dev, 64, 0x2d);
-+	}
-+}
-+
- static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
- 				  struct ieee80211_conf *conf,
- 				  struct rf_channel *rf,
-@@ -3447,6 +3477,12 @@ static void rt2800_config_channel(struct
- 			rt2800_txpower_to_dev(rt2x00dev, rf->channel,
- 					      info->default_power3);
- 
-+	switch (rt2x00dev->chip.rt) {
-+	case RT3883:
-+		rt3883_bbp_adjust(rt2x00dev, rf);
-+		break;
-+	}
-+
- 	switch (rt2x00dev->chip.rf) {
- 	case RF2020:
- 	case RF3020:
-@@ -3530,6 +3566,15 @@ static void rt2800_config_channel(struct
- 		rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
- 		rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);
- 		rt2800_bbp_write(rt2x00dev, 77, 0x98);
-+	} else if (rt2x00_rt(rt2x00dev, RT3883)) {
-+		rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);
-+		rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
-+		rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);
-+
-+		if (rt2x00dev->default_ant.rx_chain_num > 1)
-+			rt2800_bbp_write(rt2x00dev, 86, 0x46);
-+		else
-+			rt2800_bbp_write(rt2x00dev, 86, 0);
- 	} else {
- 		rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);
- 		rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
-@@ -3542,6 +3587,7 @@ static void rt2800_config_channel(struct
- 		    !rt2x00_rt(rt2x00dev, RT5392)) {
- 			if (rt2x00_has_cap_external_lna_bg(rt2x00dev)) {
- 				rt2800_bbp_write(rt2x00dev, 82, 0x62);
-+				rt2800_bbp_write(rt2x00dev, 82, 0x62);
- 				rt2800_bbp_write(rt2x00dev, 75, 0x46);
- 			} else {
- 				if (rt2x00_rt(rt2x00dev, RT3593))
-@@ -3550,19 +3596,22 @@ static void rt2800_config_channel(struct
- 					rt2800_bbp_write(rt2x00dev, 82, 0x84);
- 				rt2800_bbp_write(rt2x00dev, 75, 0x50);
- 			}
--			if (rt2x00_rt(rt2x00dev, RT3593))
-+			if (rt2x00_rt(rt2x00dev, RT3593) ||
-+			    rt2x00_rt(rt2x00dev, RT3883))
- 				rt2800_bbp_write(rt2x00dev, 83, 0x8a);
- 		}
- 
- 	} else {
- 		if (rt2x00_rt(rt2x00dev, RT3572))
- 			rt2800_bbp_write(rt2x00dev, 82, 0x94);
--		else if (rt2x00_rt(rt2x00dev, RT3593))
-+		else if (rt2x00_rt(rt2x00dev, RT3593) ||
-+			 rt2x00_rt(rt2x00dev, RT3883))
- 			rt2800_bbp_write(rt2x00dev, 82, 0x82);
- 		else
- 			rt2800_bbp_write(rt2x00dev, 82, 0xf2);
- 
--		if (rt2x00_rt(rt2x00dev, RT3593))
-+		if (rt2x00_rt(rt2x00dev, RT3593) ||
-+		    rt2x00_rt(rt2x00dev, RT3883))
- 			rt2800_bbp_write(rt2x00dev, 83, 0x9a);
- 
- 		if (rt2x00_has_cap_external_lna_a(rt2x00dev))
-@@ -3687,6 +3736,23 @@ static void rt2800_config_channel(struct
- 		usleep_range(1000, 1500);
- 	}
- 
-+	if (rt2x00_rt(rt2x00dev, RT3883)) {
-+		if (!conf_is_ht40(conf))
-+			rt2800_bbp_write(rt2x00dev, 105, 0x34);
-+		else
-+			rt2800_bbp_write(rt2x00dev, 105, 0x04);
-+
-+		/* AGC init */
-+		if (rf->channel <= 14)
-+			reg = 0x2e + rt2x00dev->lna_gain;
-+		else
-+			reg = 0x20 + ((rt2x00dev->lna_gain * 5) / 3);
-+
-+		rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg);
-+
-+		usleep_range(1000, 1500);
-+	}
-+
- 	if (rt2x00_rt(rt2x00dev, RT5592)) {
- 		rt2800_bbp_write(rt2x00dev, 195, 141);
- 		rt2800_bbp_write(rt2x00dev, 196, conf_is_ht40(conf) ? 0x10 : 0x1a);

package/kernel/mac80211/patches/600-0021-rt2x00-rt2800lib-fix-txpower_to_dev-function-for-RT3.patch

@@ -1,30 +0,0 @@
-From e37d93abaabe3ab72b0332a18092acc162307274 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Mon, 30 Sep 2013 13:57:26 +0200
-Subject: [PATCH] rt2x00: rt2800lib: fix txpower_to_dev function for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -3416,13 +3416,15 @@ static char rt2800_txpower_to_dev(struct
- 				  unsigned int channel,
- 				  char txpower)
- {
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		txpower = rt2x00_get_field8(txpower, EEPROM_TXPOWER_ALC);
- 
- 	if (channel <= 14)
- 		return clamp_t(char, txpower, MIN_G_TXPOWER, MAX_G_TXPOWER);
- 
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		return clamp_t(char, txpower, MIN_A_TXPOWER_3593,
- 			       MAX_A_TXPOWER_3593);
- 	else

package/kernel/mac80211/patches/600-0022-rt2x00-rt2800lib-use-correct-txpower-calculation-fun.patch

@@ -1,23 +0,0 @@
-From c4d79e344bd580d85821390d49f92dced7d8e125 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:29 +0100
-Subject: [PATCH] rt2x00: rt2800lib: use correct txpower calculation function
- for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4628,7 +4628,8 @@ static void rt2800_config_txpower(struct
- 				  struct ieee80211_channel *chan,
- 				  int power_level)
- {
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		rt2800_config_txpower_rt3593(rt2x00dev, chan, power_level);
- 	else
- 		rt2800_config_txpower_rt28xx(rt2x00dev, chan, power_level);

package/kernel/mac80211/patches/600-0023-rt2x00-rt2800lib-hardcode-txmixer-gain-values-to-zer.patch

@@ -1,33 +0,0 @@
-From caea0671cd8fd9ade4f5969cbe0ee545e94ae105 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sat, 24 Aug 2013 11:49:55 +0200
-Subject: [PATCH] rt2x00: rt2800lib: hardcode txmixer gain values to zero for
- RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7486,7 +7486,8 @@ static u8 rt2800_get_txmixer_gain_24g(st
- {
- 	u16 word;
- 
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		return 0;
- 
- 	rt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_BG, &word);
-@@ -7500,7 +7501,8 @@ static u8 rt2800_get_txmixer_gain_5g(str
- {
- 	u16 word;
- 
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		return 0;
- 
- 	rt2800_eeprom_read(rt2x00dev, EEPROM_TXMIXER_GAIN_A, &word);

package/kernel/mac80211/patches/600-0024-rt2x00-rt2800lib-use-correct-RT-XWI-size-for-RT3883.patch

@@ -1,20 +0,0 @@
-From 11c40fb47c4a4dd6ad060c2ae127ced89ffb9fe1 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Thu, 18 Apr 2013 14:33:33 +0200
-Subject: [PATCH] rt2x00: rt2800lib: use correct [RT]XWI size for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -558,6 +558,7 @@ void rt2800_get_txwi_rxwi_size(struct rt
- {
- 	switch (rt2x00dev->chip.rt) {
- 	case RT3593:
-+	case RT3883:
- 		*txwi_size = TXWI_DESC_SIZE_4WORDS;
- 		*rxwi_size = RXWI_DESC_SIZE_5WORDS;
- 		break;

package/kernel/mac80211/patches/600-0025-rt2x00-rt2800lib-use-correct-beacon-base-for-RT3883.patch

@@ -1,22 +0,0 @@
-From b403bdfa00665ce6b53583bdb837ffad0b91c09f Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:29 +0100
-Subject: [PATCH] rt2x00: rt2800lib: use correct beacon base for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -983,7 +983,8 @@ EXPORT_SYMBOL_GPL(rt2800_txdone_entry);
- static unsigned int rt2800_hw_beacon_base(struct rt2x00_dev *rt2x00dev,
- 					  unsigned int index)
- {
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		return HW_BEACON_BASE_HIGH(index);
- 
- 	return HW_BEACON_BASE(index);

package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch

@@ -1,22 +0,0 @@
-From 74b7eaf75fc6eb86292056ef705e543f9cd6086b Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 18 Aug 2013 09:57:58 +0200
-Subject: [PATCH] rt2x00: rt2800lib: use correct beacon count for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -8421,7 +8421,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- 	if (rt2x00_rt(rt2x00dev, RT3593))
- 		__set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
- 
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		drv_data->hw_beacon_count = 16;
- 	else
- 		drv_data->hw_beacon_count = 8;

package/kernel/mac80211/patches/600-0027-rt2x00-rt2800lib-fix-antenna-configuration-for-RT388.patch

@@ -1,22 +0,0 @@
-From fa5ad9c025610c22048add2f0ad03f62b6ca1e74 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Mon, 30 Sep 2013 16:53:33 +0200
-Subject: [PATCH] rt2x00: rt2800lib: fix antenna configuration for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -1961,7 +1961,8 @@ void rt2800_config_ant(struct rt2x00_dev
- 	rt2800_bbp_write(rt2x00dev, 3, r3);
- 	rt2800_bbp_write(rt2x00dev, 1, r1);
- 
--	if (rt2x00_rt(rt2x00dev, RT3593)) {
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883)) {
- 		if (ant->rx_chain_num == 1)
- 			rt2800_bbp_write(rt2x00dev, 86, 0x00);
- 		else

package/kernel/mac80211/patches/600-0028-rt2x00-rt2800lib-fix-LNA-gain-configuration-for-RT38.patch

@@ -1,32 +0,0 @@
-From 6d668fef3a1baa60bdd715ee062ddb6333d2647c Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Mon, 30 Sep 2013 16:58:23 +0200
-Subject: [PATCH] rt2x00: rt2800lib: fix LNA gain configuration for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -1984,7 +1984,8 @@ static void rt2800_config_lna_gain(struc
- 		rt2800_eeprom_read(rt2x00dev, EEPROM_LNA, &eeprom);
- 		lna_gain = rt2x00_get_field16(eeprom, EEPROM_LNA_A0);
- 	} else if (libconf->rf.channel <= 128) {
--		if (rt2x00_rt(rt2x00dev, RT3593)) {
-+		if (rt2x00_rt(rt2x00dev, RT3593) ||
-+		    rt2x00_rt(rt2x00dev, RT3883)) {
- 			rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &eeprom);
- 			lna_gain = rt2x00_get_field16(eeprom,
- 						      EEPROM_EXT_LNA2_A1);
-@@ -1994,7 +1995,8 @@ static void rt2800_config_lna_gain(struc
- 						      EEPROM_RSSI_BG2_LNA_A1);
- 		}
- 	} else {
--		if (rt2x00_rt(rt2x00dev, RT3593)) {
-+		if (rt2x00_rt(rt2x00dev, RT3593) ||
-+		    rt2x00_rt(rt2x00dev, RT3883)) {
- 			rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &eeprom);
- 			lna_gain = rt2x00_get_field16(eeprom,
- 						      EEPROM_EXT_LNA2_A2);

package/kernel/mac80211/patches/600-0029-rt2x00-rt2800lib-fix-VGC-setup-for-RT3883.patch

@@ -1,44 +0,0 @@
-From c49b2d829aa1c816a46a577cdec6d2ff14d9f06e Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Tue, 1 Oct 2013 15:40:08 +0200
-Subject: [PATCH] rt2x00: rt2800lib: fix VGC setup for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |   11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4828,7 +4828,8 @@ static u8 rt2800_get_default_vgc(struct 
- 		else
- 			vgc = 0x2e + rt2x00dev->lna_gain;
- 	} else { /* 5GHZ band */
--		if (rt2x00_rt(rt2x00dev, RT3593))
-+		if (rt2x00_rt(rt2x00dev, RT3593) ||
-+		    rt2x00_rt(rt2x00dev, RT3883))
- 			vgc = 0x20 + (rt2x00dev->lna_gain * 5) / 3;
- 		else if (rt2x00_rt(rt2x00dev, RT5592))
- 			vgc = 0x24 + (2 * rt2x00dev->lna_gain);
-@@ -4848,7 +4849,8 @@ static inline void rt2800_set_vgc(struct
- {
- 	if (qual->vgc_level != vgc_level) {
- 		if (rt2x00_rt(rt2x00dev, RT3572) ||
--		    rt2x00_rt(rt2x00dev, RT3593)) {
-+		    rt2x00_rt(rt2x00dev, RT3593) ||
-+		    rt2x00_rt(rt2x00dev, RT3883)) {
- 			rt2800_bbp_write_with_rx_chain(rt2x00dev, 66,
- 						       vgc_level);
- 		} else if (rt2x00_rt(rt2x00dev, RT5592)) {
-@@ -4895,6 +4897,11 @@ void rt2800_link_tuner(struct rt2x00_dev
- 		}
- 		break;
- 
-+	case RT3883:
-+		if (qual->rssi > -65)
-+			vgc += 0x10;
-+		break;
-+
- 	case RT5592:
- 		if (qual->rssi > -65)
- 			vgc += 0x20;

package/kernel/mac80211/patches/600-0030-rt2x00-rt2800lib-fix-EEPROM-LNA-validation-for-RT388.patch

@@ -1,42 +0,0 @@
-From 1616650aea676541d4dc8adc6f4219856d193c8b Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Tue, 1 Oct 2013 17:27:57 +0200
-Subject: [PATCH] rt2x00: rt2800lib: fix EEPROM LNA validation for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7623,7 +7623,8 @@ static int rt2800_validate_eeprom(struct
- 	rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_BG2, &word);
- 	if (abs(rt2x00_get_field16(word, EEPROM_RSSI_BG2_OFFSET2)) > 10)
- 		rt2x00_set_field16(&word, EEPROM_RSSI_BG2_OFFSET2, 0);
--	if (!rt2x00_rt(rt2x00dev, RT3593)) {
-+	if (!rt2x00_rt(rt2x00dev, RT3593) &&
-+	    !rt2x00_rt(rt2x00dev, RT3883)) {
- 		if (rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0x00 ||
- 		    rt2x00_get_field16(word, EEPROM_RSSI_BG2_LNA_A1) == 0xff)
- 			rt2x00_set_field16(&word, EEPROM_RSSI_BG2_LNA_A1,
-@@ -7643,7 +7644,8 @@ static int rt2800_validate_eeprom(struct
- 	rt2800_eeprom_read(rt2x00dev, EEPROM_RSSI_A2, &word);
- 	if (abs(rt2x00_get_field16(word, EEPROM_RSSI_A2_OFFSET2)) > 10)
- 		rt2x00_set_field16(&word, EEPROM_RSSI_A2_OFFSET2, 0);
--	if (!rt2x00_rt(rt2x00dev, RT3593)) {
-+	if (!rt2x00_rt(rt2x00dev, RT3593) &&
-+	    !rt2x00_rt(rt2x00dev, RT3883)) {
- 		if (rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0x00 ||
- 		    rt2x00_get_field16(word, EEPROM_RSSI_A2_LNA_A2) == 0xff)
- 			rt2x00_set_field16(&word, EEPROM_RSSI_A2_LNA_A2,
-@@ -7651,7 +7653,8 @@ static int rt2800_validate_eeprom(struct
- 	}
- 	rt2800_eeprom_write(rt2x00dev, EEPROM_RSSI_A2, word);
- 
--	if (rt2x00_rt(rt2x00dev, RT3593)) {
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883)) {
- 		rt2800_eeprom_read(rt2x00dev, EEPROM_EXT_LNA2, &word);
- 		if (rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0x00 ||
- 		    rt2x00_get_field16(word, EEPROM_EXT_LNA2_A1) == 0xff)

package/kernel/mac80211/patches/600-0031-rt2x00-rt2800lib-fix-txpower-compensation-for-RT3883.patch

@@ -1,22 +0,0 @@
-From e3871034a0e7c8a95152dc3eafbcc4535398cbdc Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Wed, 2 Oct 2013 10:11:59 +0200
-Subject: [PATCH] rt2x00: rt2800lib: fix txpower compensation for RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -4005,6 +4005,9 @@ static u8 rt2800_compensate_txpower(stru
- 	if (rt2x00_rt(rt2x00dev, RT3593))
- 		return min_t(u8, txpower, 0xc);
- 
-+	if (rt2x00_rt(rt2x00dev, RT3883))
-+		return min_t(u8, txpower, 0xf);
-+
- 	if (rt2x00_has_cap_power_limit(rt2x00dev)) {
- 		/*
- 		 * Check if eirp txpower exceed txpower_limit.

package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch

@@ -1,23 +0,0 @@
-From f6734ec72da936989a8ce4186b3ede28fbc47836 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 18 Aug 2013 21:57:34 +0200
-Subject: [PATCH] rt2x00: rt2800lib: enable RT2800_HAS_HIGH_SHARED_MEM for
- RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -8434,7 +8434,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- 	if (retval)
- 		return retval;
- 
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		__set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
- 
- 	if (rt2x00_rt(rt2x00dev, RT3593) ||

package/kernel/mac80211/patches/600-0033-rt2x00-rt2800lib-use-high-memory-for-beacons-on-RT38.patch

@@ -1,22 +0,0 @@
-From f1acfc2f397e86548ae1b479c198d4bef57050f6 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 29 Sep 2013 18:10:34 +0200
-Subject: [PATCH] rt2x00: rt2800lib: use high memory for beacons on RT3883
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800lib.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -97,7 +97,8 @@ static inline void rt2800_shared_mem_sel
- 
- static inline bool rt2800_beacon_uses_high_mem(struct rt2x00_dev *rt2x00dev)
- {
--	if (rt2x00_rt(rt2x00dev, RT3593))
-+	if (rt2x00_rt(rt2x00dev, RT3593) ||
-+	    rt2x00_rt(rt2x00dev, RT3883))
- 		return true;
- 
- 	return false;

package/kernel/mac80211/patches/600-0034-rt2x00-rt2800mmio-add-a-workaround-for-spurious-TX_F.patch

@@ -1,136 +0,0 @@
-From 5e67d4f8a46d19748b501c2ef86de3f50d3cfd51 Mon Sep 17 00:00:00 2001
-From: Gabor Juhos <juhosg@openwrt.org>
-Date: Sun, 24 Mar 2013 19:26:27 +0100
-Subject: [PATCH] rt2x00: rt2800mmio: add a workaround for spurious
- TX_FIFO_STATUS interrupts
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800mmio.c |   72 +++++++++++++++++++++++++-----
- drivers/net/wireless/rt2x00/rt2x00.h     |    5 +++
- 2 files changed, 65 insertions(+), 12 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800mmio.c
-+++ b/drivers/net/wireless/rt2x00/rt2800mmio.c
-@@ -415,9 +415,9 @@ void rt2800mmio_autowake_tasklet(unsigne
- }
- EXPORT_SYMBOL_GPL(rt2800mmio_autowake_tasklet);
- 
--static void rt2800mmio_txstatus_interrupt(struct rt2x00_dev *rt2x00dev)
-+static void rt2800mmio_txstatus_interrupt(struct rt2x00_dev *rt2x00dev,
-+					  u32 status)
- {
--	u32 status;
- 	int i;
- 
- 	/*
-@@ -438,29 +438,77 @@ static void rt2800mmio_txstatus_interrup
- 	 * Since we have only one producer and one consumer we don't
- 	 * need to lock the kfifo.
- 	 */
--	for (i = 0; i < rt2x00dev->tx->limit; i++) {
--		rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &status);
--
--		if (!rt2x00_get_field32(status, TX_STA_FIFO_VALID))
--			break;
--
-+	i = 0;
-+	do {
- 		if (!kfifo_put(&rt2x00dev->txstatus_fifo, status)) {
--			rt2x00_warn(rt2x00dev, "TX status FIFO overrun, drop tx status report\n");
-+			rt2x00_warn(rt2x00dev,
-+				    "TX status FIFO overrun, drop TX status report\n");
- 			break;
- 		}
--	}
-+
-+		if (++i >= rt2x00dev->tx->limit)
-+			break;
-+
-+ 		rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &status);
-+	} while (rt2x00_get_field32(status, TX_STA_FIFO_VALID));
- 
- 	/* Schedule the tasklet for processing the tx status. */
- 	tasklet_schedule(&rt2x00dev->txstatus_tasklet);
- }
- 
-+#define RT2800MMIO_TXSTATUS_IRQ_MAX_RETRIES	4
-+
-+static bool rt2800mmio_txstatus_is_spurious(struct rt2x00_dev *rt2x00dev,
-+					   u32 txstatus)
-+{
-+	if (likely(rt2x00_get_field32(txstatus, TX_STA_FIFO_VALID))) {
-+		rt2x00dev->txstatus_irq_retries = 0;
-+		return false;
-+	}
-+
-+	rt2x00dev->txstatus_irq_retries++;
-+
-+	/* Ensure that we don't go into an infinite IRQ loop. */
-+	if (rt2x00dev->txstatus_irq_retries >=
-+	    RT2800MMIO_TXSTATUS_IRQ_MAX_RETRIES) {
-+		rt2x00_warn(rt2x00dev,
-+			    "%u spurious TX_FIFO_STATUS interrupt(s)\n",
-+			    rt2x00dev->txstatus_irq_retries);
-+		rt2x00dev->txstatus_irq_retries = 0;
-+		return false;
-+	}
-+
-+	return true;
-+}
-+
- irqreturn_t rt2800mmio_interrupt(int irq, void *dev_instance)
- {
- 	struct rt2x00_dev *rt2x00dev = dev_instance;
- 	u32 reg, mask;
-+	u32 txstatus = 0;
- 
--	/* Read status and ACK all interrupts */
-+	/* Read status */
- 	rt2x00mmio_register_read(rt2x00dev, INT_SOURCE_CSR, &reg);
-+
-+	if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS)) {
-+		/* Due to unknown reason the hardware generates a
-+		 * TX_FIFO_STATUS interrupt before the TX_STA_FIFO
-+		 * register contain valid data. Read the TX status
-+		 * here to see if we have to process the actual
-+		 * request.
-+		 */
-+		rt2x00mmio_register_read(rt2x00dev, TX_STA_FIFO, &txstatus);
-+		if (rt2800mmio_txstatus_is_spurious(rt2x00dev, txstatus)) {
-+			/* Remove the TX_FIFO_STATUS bit so it won't be
-+			 * processed in this turn. The hardware will
-+			 * generate another IRQ for us.
-+			 */
-+			rt2x00_set_field32(&reg,
-+					   INT_SOURCE_CSR_TX_FIFO_STATUS, 0);
-+		}
-+	}
-+
-+	/* ACK interrupts */
- 	rt2x00mmio_register_write(rt2x00dev, INT_SOURCE_CSR, reg);
- 
- 	if (!reg)
-@@ -477,7 +525,7 @@ irqreturn_t rt2800mmio_interrupt(int irq
- 	mask = ~reg;
- 
- 	if (rt2x00_get_field32(reg, INT_SOURCE_CSR_TX_FIFO_STATUS)) {
--		rt2800mmio_txstatus_interrupt(rt2x00dev);
-+		rt2800mmio_txstatus_interrupt(rt2x00dev, txstatus);
- 		/*
- 		 * Never disable the TX_FIFO_STATUS interrupt.
- 		 */
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -987,6 +987,11 @@ struct rt2x00_dev {
- 	int rf_channel;
- 
- 	/*
-+	 * Counter for tx status irq retries (rt2800pci).
-+	 */
-+	unsigned int txstatus_irq_retries;
-+
-+	/*
- 	 * Protect the interrupt mask register.
- 	 */
- 	spinlock_t irqmask_lock;

package/kernel/mac80211/patches/601-rt2x00-set_pci_mwi.patch

@@ -1,13 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2x00pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
-@@ -94,8 +94,10 @@ int rt2x00pci_probe(struct pci_dev *pci_
- 
- 	pci_set_master(pci_dev);
- 
-+#ifdef CONFIG_PCI_SET_MWI
- 	if (pci_set_mwi(pci_dev))
- 		rt2x00_probe_err("MWI not available\n");
-+#endif
- 
- 	if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) {
- 		rt2x00_probe_err("PCI DMA not supported\n");

package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch

@@ -1,32 +0,0 @@
---- /dev/null
-+++ b/include/linux/rt2x00_platform.h
-@@ -0,0 +1,19 @@
-+/*
-+ * Platform data definition for the rt2x00 driver
-+ *
-+ * Copyright (C) 2011 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ *
-+ */
-+
-+#ifndef _RT2X00_PLATFORM_H
-+#define _RT2X00_PLATFORM_H
-+
-+struct rt2x00_platform_data {
-+	char *eeprom_file_name;
-+};
-+
-+#endif /* _RT2X00_PLATFORM_H */
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -38,6 +38,7 @@
- #include <linux/kfifo.h>
- #include <linux/hrtimer.h>
- #include <linux/average.h>
-+#include <linux/rt2x00_platform.h>
- 
- #include <net/mac80211.h>
- 

package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch

@@ -1,301 +0,0 @@
---- a/.local-symbols
-+++ b/.local-symbols
-@@ -289,6 +289,7 @@ RT2X00_LIB_FIRMWARE=
- RT2X00_LIB_CRYPTO=
- RT2X00_LIB_LEDS=
- RT2X00_LIB_DEBUGFS=
-+RT2X00_LIB_EEPROM=
- RT2X00_DEBUG=
- RTL_CARDS=
- RTL8192CE=
---- a/drivers/net/wireless/rt2x00/Kconfig
-+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -69,6 +69,7 @@ config RT2800PCI
- 	select RT2X00_LIB_MMIO
- 	select RT2X00_LIB_PCI
- 	select RT2X00_LIB_FIRMWARE
-+	select RT2X00_LIB_EEPROM
- 	select RT2X00_LIB_CRYPTO
- 	depends on CRC_CCITT
- 	depends on EEPROM_93CX6
-@@ -215,6 +216,7 @@ config RT2800SOC
- 	select RT2X00_LIB_MMIO
- 	select RT2X00_LIB_CRYPTO
- 	select RT2X00_LIB_FIRMWARE
-+	select RT2X00_LIB_EEPROM
- 	select RT2800_LIB
- 	select RT2800_LIB_MMIO
- 	---help---
-@@ -266,6 +268,9 @@ config RT2X00_LIB_FIRMWARE
- config RT2X00_LIB_CRYPTO
- 	boolean
- 
-+config RT2X00_LIB_EEPROM
-+	boolean
-+
- config RT2X00_LIB_LEDS
- 	boolean
- 	default y if (RT2X00_LIB=y && LEDS_CLASS=y) || (RT2X00_LIB=m && LEDS_CLASS!=n)
---- a/drivers/net/wireless/rt2x00/Makefile
-+++ b/drivers/net/wireless/rt2x00/Makefile
-@@ -7,6 +7,7 @@ rt2x00lib-$(CPTCFG_RT2X00_LIB_DEBUGFS)	+
- rt2x00lib-$(CPTCFG_RT2X00_LIB_CRYPTO)	+= rt2x00crypto.o
- rt2x00lib-$(CPTCFG_RT2X00_LIB_FIRMWARE)	+= rt2x00firmware.o
- rt2x00lib-$(CPTCFG_RT2X00_LIB_LEDS)	+= rt2x00leds.o
-+rt2x00lib-$(CPTCFG_RT2X00_LIB_EEPROM)	+= rt2x00eeprom.o
- 
- obj-$(CPTCFG_RT2X00_LIB)		+= rt2x00lib.o
- obj-$(CPTCFG_RT2X00_LIB_MMIO)		+= rt2x00mmio.o
---- a/drivers/net/wireless/rt2x00/rt2800lib.h
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.h
-@@ -43,6 +43,8 @@ struct rt2800_drv_data {
- 	} shmem_lock;
- };
- 
-+#include "rt2800.h"
-+
- struct rt2800_ops {
- 	void (*register_read)(struct rt2x00_dev *rt2x00dev,
- 			      const unsigned int offset, u32 *value);
-@@ -176,6 +178,15 @@ static inline int rt2800_read_eeprom(str
- {
- 	const struct rt2800_ops *rt2800ops = rt2x00dev->ops->drv;
- 
-+	if (rt2x00dev->eeprom_file) {
-+		memcpy(rt2x00dev->eeprom, rt2x00dev->eeprom_file->data,
-+		       EEPROM_SIZE);
-+		return 0;
-+	}
-+
-+	if (!rt2800ops->read_eeprom)
-+		return -EINVAL;
-+
- 	return rt2800ops->read_eeprom(rt2x00dev);
- }
- 
---- a/drivers/net/wireless/rt2x00/rt2800soc.c
-+++ b/drivers/net/wireless/rt2x00/rt2800soc.c
-@@ -102,19 +102,6 @@ static int rt2800soc_set_device_state(st
- 	return retval;
- }
- 
--static int rt2800soc_read_eeprom(struct rt2x00_dev *rt2x00dev)
--{
--	void __iomem *base_addr = ioremap(0x1F040000, EEPROM_SIZE);
--
--	if (!base_addr)
--		return -ENOMEM;
--
--	memcpy_fromio(rt2x00dev->eeprom, base_addr, EEPROM_SIZE);
--
--	iounmap(base_addr);
--	return 0;
--}
--
- /* Firmware functions */
- static char *rt2800soc_get_firmware_name(struct rt2x00_dev *rt2x00dev)
- {
-@@ -178,7 +165,6 @@ static const struct rt2800_ops rt2800soc
- 	.register_multiread	= rt2x00mmio_register_multiread,
- 	.register_multiwrite	= rt2x00mmio_register_multiwrite,
- 	.regbusy_read		= rt2x00mmio_regbusy_read,
--	.read_eeprom		= rt2800soc_read_eeprom,
- 	.hwcrypt_disabled	= rt2800soc_hwcrypt_disabled,
- 	.drv_write_firmware	= rt2800soc_write_firmware,
- 	.drv_init_registers	= rt2800mmio_init_registers,
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -695,6 +695,7 @@ enum rt2x00_capability_flags {
- 	REQUIRE_HT_TX_DESC,
- 	REQUIRE_PS_AUTOWAKE,
- 	REQUIRE_DELAYED_RFKILL,
-+	REQUIRE_EEPROM_FILE,
- 
- 	/*
- 	 * Capabilities
-@@ -964,6 +965,11 @@ struct rt2x00_dev {
- 	const struct firmware *fw;
- 
- 	/*
-+	 * EEPROM image.
-+	 */
-+	const struct firmware *eeprom_file;
-+
-+	/*
- 	 * FIFO for storing tx status reports between isr and tasklet.
- 	 */
- 	DECLARE_KFIFO_PTR(txstatus_fifo, u32);
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -1334,6 +1334,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
- 	INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
- 	INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
- 
-+	retval = rt2x00lib_load_eeprom_file(rt2x00dev);
-+	if (retval)
-+		goto exit;
-+
- 	/*
- 	 * Let the driver probe the device to detect the capabilities.
- 	 */
-@@ -1474,6 +1478,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
- 	 * Free the driver data.
- 	 */
- 	kfree(rt2x00dev->drv_data);
-+
-+	/*
-+	 * Free EEPROM image.
-+	 */
-+	rt2x00lib_free_eeprom_file(rt2x00dev);
- }
- EXPORT_SYMBOL_GPL(rt2x00lib_remove_dev);
- 
---- /dev/null
-+++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-@@ -0,0 +1,111 @@
-+/*
-+	Copyright (C) 2004 - 2009 Ivo van Doorn <IvDoorn@gmail.com>
-+	Copyright (C) 2004 - 2009 Gertjan van Wingerde <gwingerde@gmail.com>
-+	<http://rt2x00.serialmonkey.com>
-+
-+	This program is free software; you can redistribute it and/or modify
-+	it under the terms of the GNU General Public License as published by
-+	the Free Software Foundation; either version 2 of the License, or
-+	(at your option) any later version.
-+
-+	This program is distributed in the hope that it will be useful,
-+	but WITHOUT ANY WARRANTY; without even the implied warranty of
-+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+	GNU General Public License for more details.
-+
-+	You should have received a copy of the GNU General Public License
-+	along with this program; if not, write to the
-+	Free Software Foundation, Inc.,
-+	59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ */
-+
-+/*
-+	Module: rt2x00lib
-+	Abstract: rt2x00 eeprom file loading routines.
-+ */
-+
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+
-+#include "rt2x00.h"
-+#include "rt2x00lib.h"
-+
-+static const char *
-+rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
-+
-+	if (pdata && pdata->eeprom_file_name)
-+		return pdata->eeprom_file_name;
-+
-+	return NULL
-+}
-+
-+static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev)
-+{
-+	const struct firmware *ee;
-+	const char *ee_name;
-+	int retval;
-+
-+	ee_name = rt2x00lib_get_eeprom_file_name(rt2x00dev);
-+	if (!ee_name) {
-+		rt2x00_err(rt2x00dev,
-+			   "Invalid EEPROM filename.\n"
-+			   "Please file bug report to %s.\n", DRV_PROJECT);
-+		return -EINVAL;
-+	}
-+
-+	rt2x00_info(rt2x00dev, "Loading EEPROM data from '%s'.\n", ee_name);
-+
-+	retval = request_firmware(&ee, ee_name, rt2x00dev->dev);
-+	if (retval) {
-+		rt2x00_err(rt2x00dev, "Failed to request EEPROM.\n");
-+		return retval;
-+	}
-+
-+	if (!ee || !ee->size || !ee->data) {
-+		rt2x00_err(rt2x00dev, "Failed to read EEPROM file.\n");
-+		retval = -ENOENT;
-+		goto err_exit;
-+	}
-+
-+	if (ee->size != rt2x00dev->ops->eeprom_size) {
-+		rt2x00_err(rt2x00dev,
-+			   "EEPROM file size is invalid, it should be %d bytes\n",
-+			   rt2x00dev->ops->eeprom_size);
-+		retval = -EINVAL;
-+		goto err_release_ee;
-+	}
-+
-+	rt2x00dev->eeprom_file = ee;
-+	return 0;
-+
-+err_release_ee:
-+	release_firmware(ee);
-+err_exit:
-+	return retval;
-+}
-+
-+int rt2x00lib_load_eeprom_file(struct rt2x00_dev *rt2x00dev)
-+{
-+	int retval;
-+
-+	if (!rt2x00lib_get_eeprom_file_name(rt2x00dev))
-+		return 0;
-+
-+	set_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags);
-+
-+	if (!rt2x00dev->eeprom_file) {
-+		retval = rt2x00lib_request_eeprom_file(rt2x00dev);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	return 0;
-+}
-+
-+void rt2x00lib_free_eeprom_file(struct rt2x00_dev *rt2x00dev)
-+{
-+	release_firmware(rt2x00dev->eeprom_file);
-+	rt2x00dev->eeprom_file = NULL;
-+}
---- a/drivers/net/wireless/rt2x00/rt2x00lib.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00lib.h
-@@ -320,6 +320,22 @@ static inline void rt2x00lib_free_firmwa
- #endif /* CPTCFG_RT2X00_LIB_FIRMWARE */
- 
- /*
-+ * EEPROM file handlers.
-+ */
-+#ifdef CPTCFG_RT2X00_LIB_EEPROM
-+int rt2x00lib_load_eeprom_file(struct rt2x00_dev *rt2x00dev);
-+void rt2x00lib_free_eeprom_file(struct rt2x00_dev *rt2x00dev);
-+#else
-+static inline int rt2x00lib_load_eeprom_file(struct rt2x00_dev *rt2x00dev)
-+{
-+	return 0;
-+}
-+static inline void rt2x00lib_free_eeprom_file(struct rt2x00_dev *rt2x00dev)
-+{
-+}
-+#endif /* CPTCFG_RT2X00_LIB_EEPROM */
-+
-+/*
-  * Debugfs handlers.
-  */
- #ifdef CPTCFG_RT2X00_LIB_DEBUGFS
---- a/drivers/net/wireless/rt2x00/rt2x00soc.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00soc.c
-@@ -92,6 +92,7 @@ int rt2x00soc_probe(struct platform_devi
- 	rt2x00dev->hw = hw;
- 	rt2x00dev->irq = platform_get_irq(pdev, 0);
- 	rt2x00dev->name = pdev->dev.driver->name;
-+	set_bit(REQUIRE_EEPROM_FILE, &rt2x00dev->cap_flags);
- 
- 	rt2x00_set_chip_intf(rt2x00dev, RT2X00_CHIP_INTF_SOC);
- 

package/kernel/mac80211/patches/604-rt2x00-of_load_eeprom_filename.patch

@@ -1,33 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-@@ -26,6 +26,7 @@
- 
- #include <linux/kernel.h>
- #include <linux/module.h>
-+#include <linux/of.h>
- 
- #include "rt2x00.h"
- #include "rt2x00lib.h"
-@@ -34,11 +35,21 @@ static const char *
- rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
- {
- 	struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
-+#ifdef CONFIG_OF
-+	struct device_node *np;
-+	const char *eep;
-+#endif
- 
- 	if (pdata && pdata->eeprom_file_name)
- 		return pdata->eeprom_file_name;
- 
--	return NULL
-+#ifdef CONFIG_OF
-+	np = rt2x00dev->dev->of_node;
-+	if (np && of_property_read_string(np, "ralink,eeprom", &eep) == 0)
-+	    return eep;
-+#endif
-+
-+	return NULL;
- }
- 
- static int rt2x00lib_request_eeprom_file(struct rt2x00_dev *rt2x00dev)

package/kernel/mac80211/patches/605-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch

@@ -1,101 +0,0 @@
-From 339fe73f340161a624cc08e738d2244814852c3e Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Sun, 17 Mar 2013 00:55:04 +0100
-Subject: [PATCH] rt2x00: load eeprom on SoC from a mtd device defines inside
- OF
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- drivers/net/wireless/rt2x00/Kconfig     |    1 +
- drivers/net/wireless/rt2x00/rt2800pci.c |   44 ++++++++++++++++++++++++++-----
- 2 files changed, 39 insertions(+), 6 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/Kconfig
-+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -219,6 +219,7 @@ config RT2800SOC
- 	select RT2X00_LIB_EEPROM
- 	select RT2800_LIB
- 	select RT2800_LIB_MMIO
-+	select MTD if SOC_RT288X || SOC_RT305X
- 	---help---
- 	  This adds support for Ralink WiSoC devices.
- 	  Supported chips: RT2880, RT3050, RT3052, RT3350, RT3352.
---- a/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00eeprom.c
-@@ -26,11 +26,66 @@
- 
- #include <linux/kernel.h>
- #include <linux/module.h>
-+#include <linux/mtd/mtd.h>
-+#include <linux/mtd/partitions.h>
- #include <linux/of.h>
- 
- #include "rt2x00.h"
- #include "rt2x00lib.h"
- 
-+static int rt2800lib_read_eeprom_mtd(struct rt2x00_dev *rt2x00dev)
-+{
-+	int ret = -EINVAL;
-+#ifdef CONFIG_OF
-+	static struct firmware mtd_fw;
-+	struct device_node *np = rt2x00dev->dev->of_node, *mtd_np = NULL;
-+	size_t retlen, len = rt2x00dev->ops->eeprom_size;
-+	int size, offset = 0;
-+	struct mtd_info *mtd;
-+	const char *part;
-+	const __be32 *list;
-+	phandle phandle;
-+
-+	list = of_get_property(np, "ralink,mtd-eeprom", &size);
-+	if (!list) {
-+		dev_err(rt2x00dev->dev, "failed to load eeprom property\n");
-+		return -ENOENT;
-+	}
-+
-+	phandle = be32_to_cpup(list++);
-+	if (phandle)
-+		mtd_np = of_find_node_by_phandle(phandle);
-+	if (!mtd_np) {
-+		dev_err(rt2x00dev->dev, "failed to load mtd phandle\n");
-+		return -EINVAL;
-+	}
-+
-+	part = of_get_property(mtd_np, "label", NULL);
-+	if (!part)
-+		part = mtd_np->name;
-+
-+	mtd = get_mtd_device_nm(part);
-+	if (IS_ERR(mtd)) {
-+		dev_err(rt2x00dev->dev, "failed to get mtd device \"%s\"\n", part);
-+		return PTR_ERR(mtd);
-+	}
-+
-+	if (size > sizeof(*list))
-+		offset = be32_to_cpup(list);
-+
-+	ret = mtd_read(mtd, offset, len, &retlen, (u_char *) rt2x00dev->eeprom);
-+	put_mtd_device(mtd);
-+
-+	if (!ret) {
-+		rt2x00dev->eeprom_file = &mtd_fw;
-+		mtd_fw.size = len;
-+		mtd_fw.data = rt2x00dev->eeprom;
-+	}
-+#endif
-+
-+	return ret;
-+}
-+
- static const char *
- rt2x00lib_get_eeprom_file_name(struct rt2x00_dev *rt2x00dev)
- {
-@@ -58,6 +113,9 @@ static int rt2x00lib_request_eeprom_file
- 	const char *ee_name;
- 	int retval;
- 
-+	if (!rt2800lib_read_eeprom_mtd(rt2x00dev))
-+		return 0;
-+
- 	ee_name = rt2x00lib_get_eeprom_file_name(rt2x00dev);
- 	if (!ee_name) {
- 		rt2x00_err(rt2x00dev,

package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch

@@ -1,47 +0,0 @@
---- a/include/linux/rt2x00_platform.h
-+++ b/include/linux/rt2x00_platform.h
-@@ -14,6 +14,9 @@
- 
- struct rt2x00_platform_data {
- 	char *eeprom_file_name;
-+
-+	int disable_2ghz;
-+	int disable_5ghz;
- };
- 
- #endif /* _RT2X00_PLATFORM_H */
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -940,6 +940,22 @@ static int rt2x00lib_probe_hw_modes(stru
- 	unsigned int num_rates;
- 	unsigned int i;
- 
-+	if (rt2x00dev->dev->platform_data) {
-+		struct rt2x00_platform_data *pdata;
-+
-+		pdata = rt2x00dev->dev->platform_data;
-+		if (pdata->disable_2ghz)
-+			spec->supported_bands &= ~SUPPORT_BAND_2GHZ;
-+		if (pdata->disable_5ghz)
-+			spec->supported_bands &= ~SUPPORT_BAND_5GHZ;
-+	}
-+
-+	if ((spec->supported_bands & SUPPORT_BAND_BOTH) == 0) {
-+		rt2x00_err(rt2x00dev, "No supported bands\n");
-+		return -EINVAL;
-+	}
-+
-+
- 	num_rates = 0;
- 	if (spec->supported_rates & SUPPORT_RATE_CCK)
- 		num_rates += 4;
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -403,6 +403,7 @@ struct hw_mode_spec {
- 	unsigned int supported_bands;
- #define SUPPORT_BAND_2GHZ	0x00000001
- #define SUPPORT_BAND_5GHZ	0x00000002
-+#define SUPPORT_BAND_BOTH	(SUPPORT_BAND_2GHZ | SUPPORT_BAND_5GHZ)
- 
- 	unsigned int supported_rates;
- #define SUPPORT_RATE_CCK	0x00000001

package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch

@@ -1,63 +0,0 @@
---- a/include/linux/rt2x00_platform.h
-+++ b/include/linux/rt2x00_platform.h
-@@ -14,6 +14,7 @@
- 
- struct rt2x00_platform_data {
- 	char *eeprom_file_name;
-+	const u8 *mac_address;
- 
- 	int disable_2ghz;
- 	int disable_5ghz;
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -931,6 +931,18 @@ static void rt2x00lib_rate(struct ieee80
- 		entry->flags |= IEEE80211_RATE_SHORT_PREAMBLE;
- }
- 
-+const u8 *rt2x00lib_get_mac_address(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2x00_platform_data *pdata;
-+
-+	pdata = rt2x00dev->dev->platform_data;
-+	if (!pdata)
-+		return NULL;
-+
-+	return pdata->mac_address;
-+}
-+EXPORT_SYMBOL_GPL(rt2x00lib_get_mac_address);
-+
- static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
- 				    struct hw_mode_spec *spec)
- {
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -1407,6 +1407,7 @@ static inline void rt2x00debug_dump_fram
-  */
- u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,
- 			 struct ieee80211_vif *vif);
-+const u8 *rt2x00lib_get_mac_address(struct rt2x00_dev *rt2x00dev);
- 
- /*
-  * Interrupt context handlers.
---- a/drivers/net/wireless/rt2x00/rt61pci.c
-+++ b/drivers/net/wireless/rt2x00/rt61pci.c
-@@ -2392,6 +2392,7 @@ static int rt61pci_validate_eeprom(struc
- 	u32 reg;
- 	u16 word;
- 	u8 *mac;
-+	const u8 *pdata_mac;
- 	s8 value;
- 
- 	rt2x00mmio_register_read(rt2x00dev, E2PROM_CSR, &reg);
-@@ -2412,7 +2413,11 @@ static int rt61pci_validate_eeprom(struc
- 	/*
- 	 * Start validation of the data that has been read.
- 	 */
-+	pdata_mac = rt2x00lib_get_mac_address(rt2x00dev);
- 	mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
-+	if (pdata_mac)
-+		memcpy(mac, pdata_mac, 6);
-+
- 	if (!is_valid_ether_addr(mac)) {
- 		eth_random_addr(mac);
- 		rt2x00_eeprom_dbg(rt2x00dev, "MAC: %pM\n", mac);

package/kernel/mac80211/patches/609-rt2x00-allow_disabling_bands_through_dts.patch

@@ -1,27 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -26,6 +26,7 @@
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/log2.h>
-+#include <linux/of.h>
- 
- #include "rt2x00.h"
- #include "rt2x00lib.h"
-@@ -951,6 +952,16 @@ static int rt2x00lib_probe_hw_modes(stru
- 	struct ieee80211_rate *rates;
- 	unsigned int num_rates;
- 	unsigned int i;
-+#ifdef CONFIG_OF
-+	struct device_node *np = rt2x00dev->dev->of_node;
-+	unsigned int enabled;
-+	if (!of_property_read_u32(np, "ralink,2ghz",
-+                                          &enabled) && !enabled)
-+		spec->supported_bands &= ~SUPPORT_BAND_2GHZ;
-+	if (!of_property_read_u32(np, "ralink,5ghz",
-+                                          &enabled) && !enabled)
-+		spec->supported_bands &= ~SUPPORT_BAND_5GHZ;
-+#endif /* CONFIG_OF */
- 
- 	if (rt2x00dev->dev->platform_data) {
- 		struct rt2x00_platform_data *pdata;

package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch

@@ -1,211 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -3552,11 +3552,18 @@ static void rt2800_config_channel(struct
- 	/*
- 	 * Change BBP settings
- 	 */
-+
- 	if (rt2x00_rt(rt2x00dev, RT3352)) {
-+		rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain);
-+		rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain);
-+		rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain);
-+
- 		rt2800_bbp_write(rt2x00dev, 27, 0x0);
- 		rt2800_bbp_write(rt2x00dev, 66, 0x26 + rt2x00dev->lna_gain);
- 		rt2800_bbp_write(rt2x00dev, 27, 0x20);
- 		rt2800_bbp_write(rt2x00dev, 66, 0x26 + rt2x00dev->lna_gain);
-+		rt2800_bbp_write(rt2x00dev, 86, 0x38);
-+		rt2800_bbp_write(rt2x00dev, 83, 0x6a);
- 	} else if (rt2x00_rt(rt2x00dev, RT3593)) {
- 		if (rf->channel > 14) {
- 			/* Disable CCK Packet detection on 5GHz */
-@@ -6611,6 +6618,12 @@ static void rt2800_init_rfcsr_3290(struc
- 
- static void rt2800_init_rfcsr_3352(struct rt2x00_dev *rt2x00dev)
- {
-+	int tx0_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX0,
-+				  &rt2x00dev->cap_flags);
-+	int tx1_int_pa = test_bit(CAPABILITY_INTERNAL_PA_TX1,
-+				  &rt2x00dev->cap_flags);
-+	u8 rfcsr;
-+
- 	rt2800_rf_init_calibration(rt2x00dev, 30);
- 
- 	rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
-@@ -6646,15 +6659,30 @@ static void rt2800_init_rfcsr_3352(struc
- 	rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
- 	rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
- 	rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
--	rt2800_rfcsr_write(rt2x00dev, 34, 0x01);
-+	rfcsr = 0x01;
-+	if (!tx0_int_pa)
-+		rt2x00_set_field8(&rfcsr, RFCSR34_TX0_EXT_PA, 1);
-+	if (!tx1_int_pa)
-+		rt2x00_set_field8(&rfcsr, RFCSR34_TX1_EXT_PA, 1);
-+	rt2800_rfcsr_write(rt2x00dev, 34, rfcsr);
- 	rt2800_rfcsr_write(rt2x00dev, 35, 0x03);
- 	rt2800_rfcsr_write(rt2x00dev, 36, 0xbd);
- 	rt2800_rfcsr_write(rt2x00dev, 37, 0x3c);
- 	rt2800_rfcsr_write(rt2x00dev, 38, 0x5f);
- 	rt2800_rfcsr_write(rt2x00dev, 39, 0xc5);
- 	rt2800_rfcsr_write(rt2x00dev, 40, 0x33);
--	rt2800_rfcsr_write(rt2x00dev, 41, 0x5b);
--	rt2800_rfcsr_write(rt2x00dev, 42, 0x5b);
-+	rfcsr = 0x52;
-+	if (tx0_int_pa) {
-+		rt2x00_set_field8(&rfcsr, RFCSR41_BIT1, 1);
-+		rt2x00_set_field8(&rfcsr, RFCSR41_BIT4, 1);
-+	}
-+	rt2800_rfcsr_write(rt2x00dev, 41, rfcsr);
-+	rfcsr = 0x52;
-+	if (tx1_int_pa) {
-+		rt2x00_set_field8(&rfcsr, RFCSR42_BIT1, 1);
-+		rt2x00_set_field8(&rfcsr, RFCSR42_BIT4, 1);
-+	}
-+	rt2800_rfcsr_write(rt2x00dev, 42, rfcsr);
- 	rt2800_rfcsr_write(rt2x00dev, 43, 0xdb);
- 	rt2800_rfcsr_write(rt2x00dev, 44, 0xdb);
- 	rt2800_rfcsr_write(rt2x00dev, 45, 0xdb);
-@@ -6662,15 +6690,20 @@ static void rt2800_init_rfcsr_3352(struc
- 	rt2800_rfcsr_write(rt2x00dev, 47, 0x0d);
- 	rt2800_rfcsr_write(rt2x00dev, 48, 0x14);
- 	rt2800_rfcsr_write(rt2x00dev, 49, 0x00);
--	rt2800_rfcsr_write(rt2x00dev, 50, 0x2d);
--	rt2800_rfcsr_write(rt2x00dev, 51, 0x7f);
--	rt2800_rfcsr_write(rt2x00dev, 52, 0x00);
--	rt2800_rfcsr_write(rt2x00dev, 53, 0x52);
--	rt2800_rfcsr_write(rt2x00dev, 54, 0x1b);
--	rt2800_rfcsr_write(rt2x00dev, 55, 0x7f);
--	rt2800_rfcsr_write(rt2x00dev, 56, 0x00);
--	rt2800_rfcsr_write(rt2x00dev, 57, 0x52);
--	rt2800_rfcsr_write(rt2x00dev, 58, 0x1b);
-+	rfcsr = 0x2d;
-+	if (!tx0_int_pa)
-+		rt2x00_set_field8(&rfcsr, RFCSR50_TX0_EXT_PA, 1);
-+	if (!tx1_int_pa)
-+		rt2x00_set_field8(&rfcsr, RFCSR50_TX1_EXT_PA, 1);
-+	rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
-+	rt2800_rfcsr_write(rt2x00dev, 51, (tx0_int_pa ? 0x7f : 0x52));
-+	rt2800_rfcsr_write(rt2x00dev, 52, (tx0_int_pa ? 0x00 : 0xc0));
-+	rt2800_rfcsr_write(rt2x00dev, 53, (tx0_int_pa ? 0x52 : 0xd2));
-+	rt2800_rfcsr_write(rt2x00dev, 54, (tx0_int_pa ? 0x1b : 0xc0));
-+	rt2800_rfcsr_write(rt2x00dev, 55, (tx1_int_pa ? 0x7f : 0x52));
-+	rt2800_rfcsr_write(rt2x00dev, 56, (tx1_int_pa ? 0x00 : 0xc0));
-+	rt2800_rfcsr_write(rt2x00dev, 57, (tx0_int_pa ? 0x52 : 0x49));
-+	rt2800_rfcsr_write(rt2x00dev, 58, (tx1_int_pa ? 0x1b : 0xc0));
- 	rt2800_rfcsr_write(rt2x00dev, 59, 0x00);
- 	rt2800_rfcsr_write(rt2x00dev, 60, 0x00);
- 	rt2800_rfcsr_write(rt2x00dev, 61, 0x00);
-@@ -7691,6 +7724,7 @@ static int rt2800_init_eeprom(struct rt2
- 	 * RT53xx: defined in "EEPROM_CHIP_ID" field
- 	 */
- 	if (rt2x00_rt(rt2x00dev, RT3290) ||
-+	    rt2x00_rt(rt2x00dev, RT3352) ||
- 	    rt2x00_rt(rt2x00dev, RT5390) ||
- 	    rt2x00_rt(rt2x00dev, RT5392))
- 		rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
-@@ -7786,7 +7820,8 @@ static int rt2800_init_eeprom(struct rt2
- 	/*
- 	 * Detect if this device has Bluetooth co-existence.
- 	 */
--	if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_BT_COEXIST))
-+	if (!rt2x00_rt(rt2x00dev, RT3352) &&
-+	    rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_BT_COEXIST))
- 		__set_bit(CAPABILITY_BT_COEXIST, &rt2x00dev->cap_flags);
- 
- 	/*
-@@ -7815,6 +7850,22 @@ static int rt2800_init_eeprom(struct rt2
- 					EIRP_MAX_TX_POWER_LIMIT)
- 		__set_bit(CAPABILITY_POWER_LIMIT, &rt2x00dev->cap_flags);
- 
-+	/*
-+	 * Detect if device uses internal or external PA
-+	 */
-+	rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-+
-+	if (rt2x00_rt(rt2x00dev, RT3352)) {
-+		if (!rt2x00_get_field16(eeprom,
-+		    EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352))
-+			__set_bit(CAPABILITY_INTERNAL_PA_TX0,
-+				  &rt2x00dev->cap_flags);
-+		if (!rt2x00_get_field16(eeprom,
-+		    EEPROM_NIC_CONF1_EXTERNAL_TX1_PA_3352))
-+			__set_bit(CAPABILITY_INTERNAL_PA_TX1,
-+				  &rt2x00dev->cap_flags);
-+	}
-+
- 	return 0;
- }
- 
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -2335,6 +2335,12 @@ struct mac_iveiv_entry {
- #define RFCSR36_RF_BS			FIELD8(0x80)
- 
- /*
-+ * RFCSR 34:
-+ */
-+#define RFCSR34_TX0_EXT_PA		FIELD8(0x04)
-+#define RFCSR34_TX1_EXT_PA		FIELD8(0x08)
-+
-+/*
-  * RFCSR 38:
-  */
- #define RFCSR38_RX_LO1_EN		FIELD8(0x20)
-@@ -2346,6 +2352,18 @@ struct mac_iveiv_entry {
- #define RFCSR39_RX_LO2_EN		FIELD8(0x80)
- 
- /*
-+ * RFCSR 41:
-+ */
-+#define RFCSR41_BIT1			FIELD8(0x01)
-+#define RFCSR41_BIT4			FIELD8(0x08)
-+
-+/*
-+ * RFCSR 42:
-+ */
-+#define RFCSR42_BIT1			FIELD8(0x01)
-+#define RFCSR42_BIT4			FIELD8(0x08)
-+
-+/*
-  * RFCSR 49:
-  */
- #define RFCSR49_TX			FIELD8(0x3f)
-@@ -2358,6 +2376,8 @@ struct mac_iveiv_entry {
-  * RFCSR 50:
-  */
- #define RFCSR50_TX			FIELD8(0x3f)
-+#define RFCSR50_TX0_EXT_PA		FIELD8(0x02)
-+#define RFCSR50_TX1_EXT_PA		FIELD8(0x10)
- #define RFCSR50_EP			FIELD8(0xc0)
- /* bits for RT3593 */
- #define RFCSR50_TX_LO1_EN		FIELD8(0x20)
-@@ -2505,6 +2525,8 @@ enum rt2800_eeprom_word {
-  * INTERNAL_TX_ALC: 0: disable, 1: enable
-  * BT_COEXIST: 0: disable, 1: enable
-  * DAC_TEST: 0: disable, 1: enable
-+ * EXTERNAL_TX0_PA: 0: disable, 1: enable (only on RT3352)
-+ * EXTERNAL_TX1_PA: 0: disable, 1: enable (only on RT3352)
-  */
- #define EEPROM_NIC_CONF1_HW_RADIO		FIELD16(0x0001)
- #define EEPROM_NIC_CONF1_EXTERNAL_TX_ALC	FIELD16(0x0002)
-@@ -2521,6 +2543,8 @@ enum rt2800_eeprom_word {
- #define EEPROM_NIC_CONF1_INTERNAL_TX_ALC	FIELD16(0x2000)
- #define EEPROM_NIC_CONF1_BT_COEXIST		FIELD16(0x4000)
- #define EEPROM_NIC_CONF1_DAC_TEST		FIELD16(0x8000)
-+#define EEPROM_NIC_CONF1_EXTERNAL_TX0_PA_3352	FIELD16(0x4000)
-+#define EEPROM_NIC_CONF1_EXTERNAL_TX1_PA_3352	FIELD16(0x8000)
- 
- /*
-  * EEPROM frequency
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -715,6 +715,8 @@ enum rt2x00_capability_flags {
- 	CAPABILITY_DOUBLE_ANTENNA,
- 	CAPABILITY_BT_COEXIST,
- 	CAPABILITY_VCO_RECALIBRATION,
-+	CAPABILITY_INTERNAL_PA_TX0,
-+	CAPABILITY_INTERNAL_PA_TX1,
- };
- 
- /*

package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch

@@ -1,106 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -8202,6 +8202,27 @@ static const struct rf_channel rf_vals_5
- 	{196, 83, 0, 12, 1},
- };
- 
-+/*
-+ * RF value list for rt3xxx with Xtal20MHz
-+ * Supports: 2.4 GHz (all) (RF3322)
-+ */
-+static const struct rf_channel rf_vals_xtal20mhz_3x[] = {
-+	{1,    0xE2,	 2,  0x14},
-+	{2,    0xE3,	 2,  0x14},
-+	{3,    0xE4,	 2,  0x14},
-+	{4,    0xE5,	 2,  0x14},
-+	{5,    0xE6,	 2,  0x14},
-+	{6,    0xE7,	 2,  0x14},
-+	{7,    0xE8,	 2,  0x14},
-+	{8,    0xE9,	 2,  0x14},
-+	{9,    0xEA,	 2,  0x14},
-+	{10,   0xEB,	 2,  0x14},
-+	{11,   0xEC,	 2,  0x14},
-+	{12,   0xED,	 2,  0x14},
-+	{13,   0xEE,	 2,  0x14},
-+	{14,   0xF0,	 2,  0x18},
-+};
-+
- static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
- {
- 	struct hw_mode_spec *spec = &rt2x00dev->spec;
-@@ -8290,7 +8311,10 @@ static int rt2800_probe_hw_mode(struct r
- 	case RF5390:
- 	case RF5392:
- 		spec->num_channels = 14;
--		spec->channels = rf_vals_3x;
-+		if (spec->clk_is_20mhz)
-+			spec->channels = rf_vals_xtal20mhz_3x;
-+		else
-+			spec->channels = rf_vals_3x;
- 		break;
- 
- 	case RF3052:
-@@ -8474,6 +8498,19 @@ static int rt2800_probe_rt(struct rt2x00
- 	return 0;
- }
- 
-+int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
-+{
-+	struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
-+	struct hw_mode_spec *spec = &rt2x00dev->spec;
-+
-+	if (!pdata)
-+		return -EINVAL;
-+
-+	spec->clk_is_20mhz = pdata->clk_is_20mhz;
-+
-+	return 0;
-+}
-+
- int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
- {
- 	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-@@ -8516,6 +8553,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- 	rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
- 
- 	/*
-+	 * Probe SoC clock.
-+	 */
-+	if (rt2x00_is_soc(rt2x00dev)) {
-+		retval = rt2800_probe_clk(rt2x00dev);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	/*
- 	 * Initialize hw specifications.
- 	 */
- 	retval = rt2800_probe_hw_mode(rt2x00dev);
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -398,6 +398,7 @@ static inline struct rt2x00_intf* vif_to
-  * @channels: Device/chipset specific channel values (See &struct rf_channel).
-  * @channels_info: Additional information for channels (See &struct channel_info).
-  * @ht: Driver HT Capabilities (See &ieee80211_sta_ht_cap).
-+ * @clk_is_20mhz: External crystal of WiSoC is 20MHz instead of 40MHz
-  */
- struct hw_mode_spec {
- 	unsigned int supported_bands;
-@@ -414,6 +415,7 @@ struct hw_mode_spec {
- 	const struct channel_info *channels_info;
- 
- 	struct ieee80211_sta_ht_cap ht;
-+	int clk_is_20mhz;
- };
- 
- /*
---- a/include/linux/rt2x00_platform.h
-+++ b/include/linux/rt2x00_platform.h
-@@ -18,6 +18,7 @@ struct rt2x00_platform_data {
- 
- 	int disable_2ghz;
- 	int disable_5ghz;
-+	int clk_is_20mhz;
- };
- 
- #endif /* _RT2X00_PLATFORM_H */

package/kernel/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch

@@ -1,34 +0,0 @@
-From 04dbd87265f6ba4a373b211ba324b437d224fb2d Mon Sep 17 00:00:00 2001
-From: John Crispin <blogic@openwrt.org>
-Date: Sun, 17 Mar 2013 00:03:31 +0100
-Subject: [PATCH 21/38] rt2x00: make wmac loadable via OF on rt288x/305x SoC
-
-This patch ads the match table to allow loading the wmac support from a
-devicetree.
-
-Signed-off-by: John Crispin <blogic@openwrt.org>
----
- drivers/net/wireless/rt2x00/rt2800pci.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/net/wireless/rt2x00/rt2800soc.c
-+++ b/drivers/net/wireless/rt2x00/rt2800soc.c
-@@ -237,11 +237,18 @@ static int rt2800soc_probe(struct platfo
- 	return rt2x00soc_probe(pdev, &rt2800soc_ops);
- }
- 
-+static const struct of_device_id rt2880_wmac_match[] = {
-+	{ .compatible = "ralink,rt2880-wmac" },
-+	{},
-+};
-+MODULE_DEVICE_TABLE(of, rt2880_wmac_match);
-+
- static struct platform_driver rt2800soc_driver = {
- 	.driver		= {
- 		.name		= "rt2800_wmac",
- 		.owner		= THIS_MODULE,
- 		.mod_name	= KBUILD_MODNAME,
-+		.of_match_table	= rt2880_wmac_match,
- 	},
- 	.probe		= rt2800soc_probe,
- 	.remove		= rt2x00soc_remove,

package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch

@@ -1,29 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -36,6 +36,7 @@
- #include <linux/kernel.h>
- #include <linux/module.h>
- #include <linux/slab.h>
-+#include <linux/clk.h>
- 
- #include "rt2x00.h"
- #include "rt2800lib.h"
-@@ -8500,13 +8501,14 @@ static int rt2800_probe_rt(struct rt2x00
- 
- int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
- {
--	struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
- 	struct hw_mode_spec *spec = &rt2x00dev->spec;
-+	struct clk *clk = clk_get(rt2x00dev->dev, NULL);
- 
--	if (!pdata)
--		return -EINVAL;
-+	if (IS_ERR(clk))
-+		return PTR_ERR(clk);
- 
--	spec->clk_is_20mhz = pdata->clk_is_20mhz;
-+	if (clk_get_rate(clk) == 20000000)
-+		spec->clk_is_20mhz = 1;
- 
- 	return 0;
- }

package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch

@@ -1,276 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -74,6 +74,7 @@
- #define RF3070				0x3070
- #define RF3290				0x3290
- #define RF3853				0x3853
-+#define RF5350				0x5350
- #define RF5360				0x5360
- #define RF5362				0x5362
- #define RF5370				0x5370
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -3038,6 +3038,13 @@ static void rt2800_config_channel_rf53xx
- 
- 				rt2800_rfcsr_write(rt2x00dev, 59,
- 						   r59_non_bt[idx]);
-+			} else if (rt2x00_rt(rt2x00dev, RT5350)) {
-+				static const char r59_non_bt[] = {0x0b, 0x0b,
-+					0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
-+					0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
-+
-+				rt2800_rfcsr_write(rt2x00dev, 59,
-+						   r59_non_bt[idx]);
- 			}
- 		}
- 	}
-@@ -3516,6 +3523,7 @@ static void rt2800_config_channel(struct
- 		rt2800_config_channel_rf3853(rt2x00dev, conf, rf, info);
- 		break;
- 	case RF3070:
-+	case RF5350:
- 	case RF5360:
- 	case RF5362:
- 	case RF5370:
-@@ -3534,6 +3542,7 @@ static void rt2800_config_channel(struct
- 	if (rt2x00_rf(rt2x00dev, RF3070) ||
- 	    rt2x00_rf(rt2x00dev, RF3290) ||
- 	    rt2x00_rf(rt2x00dev, RF3322) ||
-+	    rt2x00_rf(rt2x00dev, RF5350) ||
- 	    rt2x00_rf(rt2x00dev, RF5360) ||
- 	    rt2x00_rf(rt2x00dev, RF5362) ||
- 	    rt2x00_rf(rt2x00dev, RF5370) ||
-@@ -3812,7 +3821,8 @@ static void rt2800_config_channel(struct
- 	/*
- 	 * Clear update flag
- 	 */
--	if (rt2x00_rt(rt2x00dev, RT3352)) {
-+	if (rt2x00_rt(rt2x00dev, RT3352) ||
-+	    rt2x00_rt(rt2x00dev, RT5350)) {
- 		rt2800_bbp_read(rt2x00dev, 49, &bbp);
- 		rt2x00_set_field8(&bbp, BBP49_UPDATE_FLAG, 0);
- 		rt2800_bbp_write(rt2x00dev, 49, bbp);
-@@ -4691,6 +4701,7 @@ void rt2800_vco_calibration(struct rt2x0
- 	case RF3070:
- 	case RF3290:
- 	case RF3853:
-+	case RF5350:
- 	case RF5360:
- 	case RF5362:
- 	case RF5370:
-@@ -5104,6 +5115,8 @@ static int rt2800_init_registers(struct 
- 		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
- 		rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
- 		rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
-+	} else if (rt2x00_rt(rt2x00dev, RT5350)) {
-+		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
- 	} else {
- 		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);
- 		rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
-@@ -5759,9 +5772,13 @@ static void rt2800_init_bbp_3352(struct 
- 
- 	rt2800_bbp_write(rt2x00dev, 82, 0x62);
- 
--	rt2800_bbp_write(rt2x00dev, 83, 0x6a);
--
--	rt2800_bbp_write(rt2x00dev, 84, 0x99);
-+	if (rt2x00_rt(rt2x00dev, RT5350)) {
-+		rt2800_bbp_write(rt2x00dev, 83, 0x7a);
-+		rt2800_bbp_write(rt2x00dev, 84, 0x9a);
-+	} else {
-+		rt2800_bbp_write(rt2x00dev, 83, 0x6a);
-+		rt2800_bbp_write(rt2x00dev, 84, 0x99);
-+	}
- 
- 	rt2800_bbp_write(rt2x00dev, 86, 0x38);
- 
-@@ -5775,9 +5792,13 @@ static void rt2800_init_bbp_3352(struct 
- 
- 	rt2800_bbp_write(rt2x00dev, 104, 0x92);
- 
--	rt2800_bbp_write(rt2x00dev, 105, 0x34);
--
--	rt2800_bbp_write(rt2x00dev, 106, 0x05);
-+	if (rt2x00_rt(rt2x00dev, RT5350)) {
-+		rt2800_bbp_write(rt2x00dev, 105, 0x3c);
-+		rt2800_bbp_write(rt2x00dev, 106, 0x03);
-+	} else {
-+		rt2800_bbp_write(rt2x00dev, 105, 0x34);
-+		rt2800_bbp_write(rt2x00dev, 106, 0x05);
-+	}
- 
- 	rt2800_bbp_write(rt2x00dev, 120, 0x50);
- 
-@@ -5802,6 +5823,13 @@ static void rt2800_init_bbp_3352(struct 
- 	rt2800_bbp_write(rt2x00dev, 143, 0xa2);
- 
- 	rt2800_bbp_write(rt2x00dev, 148, 0xc8);
-+
-+	if (rt2x00_rt(rt2x00dev, RT5350)) {
-+		rt2800_bbp_write(rt2x00dev, 150, 0x40); /* Antenna Software OFDM */
-+		rt2800_bbp_write(rt2x00dev, 151, 0x30); /* Antenna Software CCK */
-+		rt2800_bbp_write(rt2x00dev, 152, 0xa3);
-+		rt2800_bbp_write(rt2x00dev, 154, 0); /* Clear previously selected antenna */
-+	}
- }
- 
- static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev)
-@@ -6143,6 +6171,7 @@ static void rt2800_init_bbp(struct rt2x0
- 		rt2800_init_bbp_3290(rt2x00dev);
- 		break;
- 	case RT3352:
-+	case RT5350:
- 		rt2800_init_bbp_3352(rt2x00dev);
- 		break;
- 	case RT3390:
-@@ -7094,6 +7123,76 @@ static void rt2800_init_rfcsr_3883(struc
- 	rt2800_rfcsr_write(rt2x00dev, 20, rfcsr);
- }
- 
-+static void rt2800_init_rfcsr_5350(struct rt2x00_dev *rt2x00dev)
-+{
-+	rt2800_rfcsr_write(rt2x00dev, 0, 0xf0);
-+	rt2800_rfcsr_write(rt2x00dev, 1, 0x23);
-+	rt2800_rfcsr_write(rt2x00dev, 2, 0x50);
-+	rt2800_rfcsr_write(rt2x00dev, 3, 0x08);
-+	rt2800_rfcsr_write(rt2x00dev, 4, 0x49);
-+	rt2800_rfcsr_write(rt2x00dev, 5, 0x10);
-+	rt2800_rfcsr_write(rt2x00dev, 6, 0xe0);
-+	rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 8, 0xf1);
-+	rt2800_rfcsr_write(rt2x00dev, 9, 0x02);
-+	rt2800_rfcsr_write(rt2x00dev, 10, 0x53);
-+	rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);
-+	rt2800_rfcsr_write(rt2x00dev, 12, 0x46);
-+	if(rt2x00dev->spec.clk_is_20mhz)
-+		rt2800_rfcsr_write(rt2x00dev, 13, 0x1f);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);
-+	rt2800_rfcsr_write(rt2x00dev, 14, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 15, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 16, 0xc0);
-+	rt2800_rfcsr_write(rt2x00dev, 18, 0x03);
-+	rt2800_rfcsr_write(rt2x00dev, 19, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 20, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 21, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 22, 0x20);
-+	rt2800_rfcsr_write(rt2x00dev, 23, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 25, 0x80);
-+	rt2800_rfcsr_write(rt2x00dev, 26, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 27, 0x03);
-+	rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 29, 0xd0);
-+	rt2800_rfcsr_write(rt2x00dev, 30, 0x10);
-+	rt2800_rfcsr_write(rt2x00dev, 31, 0x80);
-+	rt2800_rfcsr_write(rt2x00dev, 32, 0x80);
-+	rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 34, 0x07);
-+	rt2800_rfcsr_write(rt2x00dev, 35, 0x12);
-+	rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 37, 0x08);
-+	rt2800_rfcsr_write(rt2x00dev, 38, 0x85);
-+	rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);
-+	rt2800_rfcsr_write(rt2x00dev, 40, 0x0b);
-+	rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);
-+	rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);
-+	rt2800_rfcsr_write(rt2x00dev, 43, 0x9b);
-+	rt2800_rfcsr_write(rt2x00dev, 44, 0x0c);
-+	rt2800_rfcsr_write(rt2x00dev, 45, 0xa6);
-+	rt2800_rfcsr_write(rt2x00dev, 46, 0x73);
-+	rt2800_rfcsr_write(rt2x00dev, 47, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 48, 0x10);
-+	rt2800_rfcsr_write(rt2x00dev, 49, 0x80);
-+	rt2800_rfcsr_write(rt2x00dev, 50, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 51, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 52, 0x38);
-+	rt2800_rfcsr_write(rt2x00dev, 53, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 54, 0x38);
-+	rt2800_rfcsr_write(rt2x00dev, 55, 0x43);
-+	rt2800_rfcsr_write(rt2x00dev, 56, 0x82);
-+	rt2800_rfcsr_write(rt2x00dev, 57, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 58, 0x39);
-+	rt2800_rfcsr_write(rt2x00dev, 59, 0x0b);
-+	rt2800_rfcsr_write(rt2x00dev, 60, 0x45);
-+	rt2800_rfcsr_write(rt2x00dev, 61, 0xd1);
-+	rt2800_rfcsr_write(rt2x00dev, 62, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 63, 0x00);
-+}
-+
- static void rt2800_init_rfcsr_5390(struct rt2x00_dev *rt2x00dev)
- {
- 	rt2800_rf_init_calibration(rt2x00dev, 2);
-@@ -7334,6 +7433,9 @@ static void rt2800_init_rfcsr(struct rt2
- 	case RT3593:
- 		rt2800_init_rfcsr_3593(rt2x00dev);
- 		break;
-+	case RT5350:
-+		rt2800_init_rfcsr_5350(rt2x00dev);
-+		break;
- 	case RT5390:
- 		rt2800_init_rfcsr_5390(rt2x00dev);
- 		break;
-@@ -7593,6 +7695,12 @@ static int rt2800_validate_eeprom(struct
- 		rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF2820);
- 		rt2800_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
- 		rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
-+	} else if (rt2x00_rt(rt2x00dev, RT5350)) {
-+		rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RXPATH, 1);
-+		rt2x00_set_field16(&word, EEPROM_NIC_CONF0_TXPATH, 1);
-+		rt2x00_set_field16(&word, EEPROM_NIC_CONF0_RF_TYPE, RF3320);
-+		rt2x00_eeprom_write(rt2x00dev, EEPROM_NIC_CONF0, word);
-+		rt2x00_eeprom_dbg(rt2x00dev, "Antenna: 0x%04x\n", word);
- 	} else if (rt2x00_rt(rt2x00dev, RT2860) ||
- 		   rt2x00_rt(rt2x00dev, RT2872)) {
- 		/*
-@@ -7731,6 +7839,8 @@ static int rt2800_init_eeprom(struct rt2
- 		rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
- 	else if (rt2x00_rt(rt2x00dev, RT3883))
- 		rf = RF3853;
-+	else if (rt2x00_rt(rt2x00dev, RT5350))
-+		rf = RF5350;
- 	else
- 		rf = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);
- 
-@@ -7750,6 +7860,7 @@ static int rt2800_init_eeprom(struct rt2
- 	case RF3320:
- 	case RF3322:
- 	case RF3853:
-+	case RF5350:
- 	case RF5360:
- 	case RF5362:
- 	case RF5370:
-@@ -8305,6 +8416,7 @@ static int rt2800_probe_hw_mode(struct r
- 	case RF3290:
- 	case RF3320:
- 	case RF3322:
-+	case RF5350:
- 	case RF5360:
- 	case RF5362:
- 	case RF5370:
-@@ -8444,6 +8556,7 @@ static int rt2800_probe_hw_mode(struct r
- 	case RF3070:
- 	case RF3290:
- 	case RF3853:
-+	case RF5350:
- 	case RF5360:
- 	case RF5362:
- 	case RF5370:
-@@ -8484,6 +8597,7 @@ static int rt2800_probe_rt(struct rt2x00
- 	case RT3572:
- 	case RT3593:
- 	case RT3883:
-+	case RT5350:
- 	case RT5390:
- 	case RT5392:
- 	case RT5592:
---- a/drivers/net/wireless/rt2x00/rt2x00.h
-+++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -169,6 +169,7 @@ struct rt2x00_chip {
- #define RT3572		0x3572
- #define RT3593		0x3593
- #define RT3883		0x3883	/* WSOC */
-+#define RT5350		0x5350  /* WSOC 2.4GHz */
- #define RT5390		0x5390  /* 2.4GHz */
- #define RT5392		0x5392  /* 2.4GHz */
- #define RT5592		0x5592

package/kernel/mac80211/patches/619-rt2x00-change-led-polarity-from-OF.patch

@@ -1,40 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -37,6 +37,7 @@
- #include <linux/module.h>
- #include <linux/slab.h>
- #include <linux/clk.h>
-+#include <linux/of.h>
- 
- #include "rt2x00.h"
- #include "rt2800lib.h"
-@@ -7950,6 +7951,17 @@ static int rt2800_init_eeprom(struct rt2
- 	rt2800_init_led(rt2x00dev, &rt2x00dev->led_assoc, LED_TYPE_ASSOC);
- 	rt2800_init_led(rt2x00dev, &rt2x00dev->led_qual, LED_TYPE_QUALITY);
- 
-+	{
-+		struct device_node *np = rt2x00dev->dev->of_node;
-+		unsigned int led_polarity;
-+
-+		/* Allow overriding polarity from OF */
-+		if (!of_property_read_u32(np, "ralink,led-polarity",
-+					  &led_polarity))
-+			rt2x00_set_field16(&eeprom, EEPROM_FREQ_LED_POLARITY,
-+					   led_polarity);
-+	}
-+
- 	rt2x00dev->led_mcu_reg = eeprom;
- #endif /* CPTCFG_RT2X00_LIB_LEDS */
- 
---- a/drivers/net/wireless/rt2x00/rt2x00leds.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00leds.c
-@@ -109,6 +109,9 @@ static int rt2x00leds_register_led(struc
- 	led->led_dev.name = name;
- 	led->led_dev.brightness = LED_OFF;
- 
-+	if (rt2x00_is_soc(rt2x00dev))
-+		led->led_dev.brightness_set(&led->led_dev, LED_OFF);
-+
- 	retval = led_classdev_register(device, &led->led_dev);
- 	if (retval) {
- 		rt2x00_err(rt2x00dev, "Failed to register led handler\n");

package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch

@@ -1,11 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2x00dev.c
-+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
-@@ -1283,7 +1283,7 @@ static inline void rt2x00lib_set_if_comb
- 	 */
- 	if_limit = &rt2x00dev->if_limits_ap;
- 	if_limit->max = rt2x00dev->ops->max_ap_intf;
--	if_limit->types = BIT(NL80211_IFTYPE_AP);
-+	if_limit->types = BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_STATION);
- #ifdef CPTCFG_MAC80211_MESH
- 	if_limit->types |= BIT(NL80211_IFTYPE_MESH_POINT);
- #endif

package/kernel/mac80211/patches/620-rt2x00-rt3352-rf-id.patch

@@ -1,15 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -7834,10 +7834,11 @@ static int rt2800_init_eeprom(struct rt2
- 	 * RT53xx: defined in "EEPROM_CHIP_ID" field
- 	 */
- 	if (rt2x00_rt(rt2x00dev, RT3290) ||
--	    rt2x00_rt(rt2x00dev, RT3352) ||
- 	    rt2x00_rt(rt2x00dev, RT5390) ||
- 	    rt2x00_rt(rt2x00dev, RT5392))
- 		rt2800_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &rf);
-+	else if (rt2x00_rt(rt2x00dev, RT3352))
-+		rf = RF3322;
- 	else if (rt2x00_rt(rt2x00dev, RT3883))
- 		rf = RF3853;
- 	else if (rt2x00_rt(rt2x00dev, RT5350))

package/kernel/mac80211/patches/621-rt2x00-ht20_40_fix.patch

@@ -1,29 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -2321,6 +2321,8 @@ struct mac_iveiv_entry {
- #define RFCSR30_RX_H20M			FIELD8(0x04)
- #define RFCSR30_RX_VCM			FIELD8(0x18)
- #define RFCSR30_RF_CALIBRATION		FIELD8(0x80)
-+#define RF3322_RFCSR30_TX_H20M		FIELD8(0x01)
-+#define RF3322_RFCSR30_RX_H20M		FIELD8(0x02)
- 
- /*
-  * RFCSR 31:
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -3551,8 +3551,13 @@ static void rt2800_config_channel(struct
- 	    rt2x00_rf(rt2x00dev, RF5390) ||
- 	    rt2x00_rf(rt2x00dev, RF5392)) {
- 		rt2800_rfcsr_read(rt2x00dev, 30, &rfcsr);
--		rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, 0);
--		rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, 0);
-+		if(rt2x00_rf(rt2x00dev, RF3322)) {
-+			rt2x00_set_field8(&rfcsr, RF3322_RFCSR30_TX_H20M, conf_is_ht40(conf));
-+			rt2x00_set_field8(&rfcsr, RF3322_RFCSR30_RX_H20M, conf_is_ht40(conf));
-+		} else {
-+			rt2x00_set_field8(&rfcsr, RFCSR30_TX_H20M, conf_is_ht40(conf));
-+			rt2x00_set_field8(&rfcsr, RFCSR30_RX_H20M, conf_is_ht40(conf));
-+		}
- 		rt2800_rfcsr_write(rt2x00dev, 30, rfcsr);
- 
- 		rt2800_rfcsr_read(rt2x00dev, 3, &rfcsr);

package/kernel/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch

@@ -1,10 +0,0 @@
---- a/drivers/net/wireless/mwl8k.c
-+++ b/drivers/net/wireless/mwl8k.c
-@@ -5675,6 +5675,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw")
- MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API));
- 
- static const struct pci_device_id mwl8k_pci_id_table[] = {
-+	{ PCI_VDEVICE(MARVELL, 0x2a02), .driver_data = MWL8363, },
- 	{ PCI_VDEVICE(MARVELL, 0x2a0a), .driver_data = MWL8363, },
- 	{ PCI_VDEVICE(MARVELL, 0x2a0c), .driver_data = MWL8363, },
- 	{ PCI_VDEVICE(MARVELL, 0x2a24), .driver_data = MWL8363, },

package/kernel/mac80211/patches/805-b43-gpio-mask-module-option.patch

@@ -1,37 +0,0 @@
---- a/drivers/net/wireless/b43/b43.h
-+++ b/drivers/net/wireless/b43/b43.h
-@@ -837,6 +837,7 @@ struct b43_wldev {
- 	bool qos_enabled;		/* TRUE, if QoS is used. */
- 	bool hwcrypto_enabled;		/* TRUE, if HW crypto acceleration is enabled. */
- 	bool use_pio;			/* TRUE if next init should use PIO */
-+	int gpiomask;			/* GPIO LED mask as a module parameter */
- 
- 	/* PHY/Radio device. */
- 	struct b43_phy phy;
---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -76,6 +76,11 @@ MODULE_FIRMWARE("b43/ucode16_mimo.fw");
- MODULE_FIRMWARE("b43/ucode5.fw");
- MODULE_FIRMWARE("b43/ucode9.fw");
- 
-+static int modparam_gpiomask = 0x000F;
-+module_param_named(gpiomask, modparam_gpiomask, int, 0444);
-+MODULE_PARM_DESC(gpiomask,
-+         "GPIO mask for LED control (default 0x000F)");
-+
- static int modparam_bad_frames_preempt;
- module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);
- MODULE_PARM_DESC(bad_frames_preempt,
-@@ -2844,10 +2849,10 @@ static int b43_gpio_init(struct b43_wlde
- 	u32 mask, set;
- 
- 	b43_maskset32(dev, B43_MMIO_MACCTL, ~B43_MACCTL_GPOUTSMSK, 0);
--	b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, 0xF);
-+	b43_maskset16(dev, B43_MMIO_GPIO_MASK, ~0, modparam_gpiomask);
- 
- 	mask = 0x0000001F;
--	set = 0x0000000F;
-+	set = modparam_gpiomask;
- 	if (dev->dev->chip_id == 0x4301) {
- 		mask |= 0x0060;
- 		set |= 0x0060;

package/kernel/mac80211/patches/810-b43_no_pio.patch

@@ -1,86 +0,0 @@
---- a/drivers/net/wireless/b43/Makefile
-+++ b/drivers/net/wireless/b43/Makefile
-@@ -16,7 +16,7 @@ b43-$(CPTCFG_B43_PHY_LCN)	+= phy_lcn.o t
- b43-y				+= sysfs.o
- b43-y				+= xmit.o
- b43-y				+= dma.o
--b43-y				+= pio.o
-+b43-$(CPTCFG_B43_PIO)		+= pio.o
- b43-y				+= rfkill.o
- b43-y				+= ppr.o
- b43-$(CPTCFG_B43_LEDS)		+= leds.o
---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -1970,10 +1970,12 @@ static void b43_do_interrupt_thread(stru
- 			dma_reason[0], dma_reason[1],
- 			dma_reason[2], dma_reason[3],
- 			dma_reason[4], dma_reason[5]);
-+#ifdef CPTCFG_B43_PIO
- 		b43err(dev->wl, "This device does not support DMA "
- 			       "on your system. It will now be switched to PIO.\n");
- 		/* Fall back to PIO transfers if we get fatal DMA errors! */
- 		dev->use_pio = true;
-+#endif
- 		b43_controller_restart(dev, "DMA error");
- 		return;
- 	}
---- a/drivers/net/wireless/b43/pio.h
-+++ b/drivers/net/wireless/b43/pio.h
-@@ -150,7 +150,7 @@ static inline void b43_piorx_write32(str
- 	b43_write32(q->dev, q->mmio_base + offset, value);
- }
- 
--
-+#ifdef CPTCFG_B43_PIO
- int b43_pio_init(struct b43_wldev *dev);
- void b43_pio_free(struct b43_wldev *dev);
- 
-@@ -161,5 +161,37 @@ void b43_pio_rx(struct b43_pio_rxqueue *
- 
- void b43_pio_tx_suspend(struct b43_wldev *dev);
- void b43_pio_tx_resume(struct b43_wldev *dev);
-+#else
-+static inline int b43_pio_init(struct b43_wldev *dev)
-+{
-+	return 0;
-+}
-+
-+static inline void b43_pio_free(struct b43_wldev *dev)
-+{
-+}
-+
-+static inline int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
-+{
-+	return 0;
-+}
-+
-+static inline void b43_pio_handle_txstatus(struct b43_wldev *dev,
-+					   const struct b43_txstatus *status)
-+{
-+}
-+
-+static inline void b43_pio_rx(struct b43_pio_rxqueue *q)
-+{
-+}
-+
-+static inline void b43_pio_tx_suspend(struct b43_wldev *dev)
-+{
-+}
-+
-+static inline void b43_pio_tx_resume(struct b43_wldev *dev)
-+{
-+}
-+#endif /* CPTCFG_B43_PIO */
- 
- #endif /* B43_PIO_H_ */
---- a/drivers/net/wireless/b43/Kconfig
-+++ b/drivers/net/wireless/b43/Kconfig
-@@ -118,7 +118,7 @@ config B43_BCMA_PIO
- 	default y
- 
- config B43_PIO
--	bool
-+	bool "Broadcom 43xx PIO support"
- 	depends on B43 && B43_SSB
- 	select SSB_BLOCKIO
- 	default y

package/kernel/mac80211/patches/820-b43-add-antenna-control.patch

@@ -1,131 +0,0 @@
---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -1617,7 +1617,7 @@ static void b43_write_beacon_template(st
- 				  len, ram_offset, shm_size_offset, rate);
- 
- 	/* Write the PHY TX control parameters. */
--	antenna = B43_ANTENNA_DEFAULT;
-+	antenna = dev->tx_antenna;
- 	antenna = b43_antenna_to_phyctl(antenna);
- 	ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
- 	/* We can't send beacons with short preamble. Would get PHY errors. */
-@@ -3264,8 +3264,8 @@ static int b43_chip_init(struct b43_wlde
- 
- 	/* Select the antennae */
- 	if (phy->ops->set_rx_antenna)
--		phy->ops->set_rx_antenna(dev, B43_ANTENNA_DEFAULT);
--	b43_mgmtframe_txantenna(dev, B43_ANTENNA_DEFAULT);
-+		phy->ops->set_rx_antenna(dev, dev->rx_antenna);
-+	b43_mgmtframe_txantenna(dev, dev->tx_antenna);
- 
- 	if (phy->type == B43_PHYTYPE_B) {
- 		value16 = b43_read16(dev, 0x005E);
-@@ -3965,7 +3965,6 @@ static int b43_op_config(struct ieee8021
- 	struct b43_wldev *dev = wl->current_dev;
- 	struct b43_phy *phy = &dev->phy;
- 	struct ieee80211_conf *conf = &hw->conf;
--	int antenna;
- 	int err = 0;
- 
- 	mutex_lock(&wl->mutex);
-@@ -4008,11 +4007,9 @@ static int b43_op_config(struct ieee8021
- 	}
- 
- 	/* Antennas for RX and management frame TX. */
--	antenna = B43_ANTENNA_DEFAULT;
--	b43_mgmtframe_txantenna(dev, antenna);
--	antenna = B43_ANTENNA_DEFAULT;
-+	b43_mgmtframe_txantenna(dev, dev->tx_antenna);
- 	if (phy->ops->set_rx_antenna)
--		phy->ops->set_rx_antenna(dev, antenna);
-+		phy->ops->set_rx_antenna(dev, dev->rx_antenna);
- 
- 	if (wl->radio_enabled != phy->radio_on) {
- 		if (wl->radio_enabled) {
-@@ -5162,6 +5159,47 @@ static int b43_op_get_survey(struct ieee
- 	return 0;
- }
- 
-+static int b43_op_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant)
-+{
-+	struct b43_wl *wl = hw_to_b43_wl(hw);
-+	struct b43_wldev *dev = wl->current_dev;
-+
-+	if (tx_ant == 1 && rx_ant == 1) {
-+		dev->tx_antenna = B43_ANTENNA0;
-+		dev->rx_antenna = B43_ANTENNA0;
-+	}
-+	else if (tx_ant == 2 && rx_ant == 2) {
-+		dev->tx_antenna = B43_ANTENNA1;
-+		dev->rx_antenna = B43_ANTENNA1;
-+	}
-+	else if ((tx_ant & 3) == 3 && (rx_ant & 3) == 3) {
-+		dev->tx_antenna = B43_ANTENNA_DEFAULT;
-+		dev->rx_antenna = B43_ANTENNA_DEFAULT;
-+	}
-+	else {
-+		return -EINVAL;
-+	}
-+
-+	return 0;
-+}
-+
-+
-+static int b43_op_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant)
-+{
-+	struct b43_wl *wl = hw_to_b43_wl(hw);
-+	struct b43_wldev *dev = wl->current_dev;
-+
-+	switch (dev->tx_antenna) {
-+	case B43_ANTENNA0:
-+		*tx_ant = 1; *rx_ant = 1; break;
-+	case B43_ANTENNA1:
-+		*tx_ant = 2; *rx_ant = 2; break;
-+	case B43_ANTENNA_DEFAULT:
-+		*tx_ant = 3; *rx_ant = 3; break;
-+	}
-+	return 0;
-+}
-+
- static const struct ieee80211_ops b43_hw_ops = {
- 	.tx			= b43_op_tx,
- 	.conf_tx		= b43_op_conf_tx,
-@@ -5183,6 +5221,8 @@ static const struct ieee80211_ops b43_hw
- 	.sw_scan_complete	= b43_op_sw_scan_complete_notifier,
- 	.get_survey		= b43_op_get_survey,
- 	.rfkill_poll		= b43_rfkill_poll,
-+	.set_antenna		= b43_op_set_antenna,
-+	.get_antenna		= b43_op_get_antenna,
- };
- 
- /* Hard-reset the chip. Do not call this directly.
-@@ -5486,6 +5526,8 @@ static int b43_one_core_attach(struct b4
- 	if (!wldev)
- 		goto out;
- 
-+	wldev->rx_antenna = B43_ANTENNA_DEFAULT;
-+	wldev->tx_antenna = B43_ANTENNA_DEFAULT;
- 	wldev->use_pio = b43_modparam_pio;
- 	wldev->dev = dev;
- 	wldev->wl = wl;
-@@ -5576,6 +5618,9 @@ static struct b43_wl *b43_wireless_init(
- 
- 	hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
- 
-+	hw->wiphy->available_antennas_rx = 0x3;
-+	hw->wiphy->available_antennas_tx = 0x3;
-+
- 	wl->hw_registred = false;
- 	hw->max_rates = 2;
- 	SET_IEEE80211_DEV(hw, dev->dev);
---- a/drivers/net/wireless/b43/b43.h
-+++ b/drivers/net/wireless/b43/b43.h
-@@ -838,6 +838,8 @@ struct b43_wldev {
- 	bool hwcrypto_enabled;		/* TRUE, if HW crypto acceleration is enabled. */
- 	bool use_pio;			/* TRUE if next init should use PIO */
- 	int gpiomask;			/* GPIO LED mask as a module parameter */
-+	int rx_antenna;			/* Used RX antenna (B43_ANTENNAxxx) */
-+	int tx_antenna;			/* Used TX antenna (B43_ANTENNAxxx) */
- 
- 	/* PHY/Radio device. */
- 	struct b43_phy phy;

package/kernel/mac80211/patches/841-b43-reduce-number-of-RX-slots.patch

@@ -1,11 +0,0 @@
---- a/drivers/net/wireless/b43/dma.h
-+++ b/drivers/net/wireless/b43/dma.h
-@@ -169,7 +169,7 @@ struct b43_dmadesc_generic {
- 
- /* DMA engine tuning knobs */
- #define B43_TXRING_SLOTS		256
--#define B43_RXRING_SLOTS		256
-+#define B43_RXRING_SLOTS		32
- #define B43_DMA0_RX_FW598_BUFSIZE	(B43_DMA0_RX_FW598_FO + IEEE80211_MAX_FRAME_LEN)
- #define B43_DMA0_RX_FW351_BUFSIZE	(B43_DMA0_RX_FW351_FO + IEEE80211_MAX_FRAME_LEN)
- 

package/kernel/mac80211/patches/845-b43-only-use-gpio-0-1-for-led.patch

@@ -1,17 +0,0 @@
---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -2861,6 +2861,14 @@ static int b43_gpio_init(struct b43_wlde
- 	} else if (dev->dev->chip_id == 0x5354) {
- 		/* Don't allow overtaking buttons GPIOs */
- 		set &= 0x2; /* 0x2 is LED GPIO on BCM5354 */
-+	} else if (dev->dev->chip_id == BCMA_CHIP_ID_BCM4716 || 
-+		   dev->dev->chip_id == BCMA_CHIP_ID_BCM47162 ||
-+		   dev->dev->chip_id == BCMA_CHIP_ID_BCM5356 ||
-+		   dev->dev->chip_id == BCMA_CHIP_ID_BCM5357 ||
-+		   dev->dev->chip_id == BCMA_CHIP_ID_BCM53572) {
-+		/* just use gpio 0 and 1 for 2.4 GHz wifi led */
-+		set &= 0x3;
-+		mask &= 0x3;
- 	}
- 
- 	if (0 /* FIXME: conditional unknown */ ) {

package/kernel/mac80211/patches/847-b43-always-take-overlapping-devs.patch

@@ -1,11 +0,0 @@
---- a/drivers/net/wireless/b43/main.c
-+++ b/drivers/net/wireless/b43/main.c
-@@ -118,7 +118,7 @@ static int b43_modparam_pio = 0;
- module_param_named(pio, b43_modparam_pio, int, 0644);
- MODULE_PARM_DESC(pio, "Use PIO accesses by default: 0=DMA, 1=PIO");
- 
--static int modparam_allhwsupport = !IS_ENABLED(CPTCFG_BRCMSMAC);
-+static int modparam_allhwsupport = 1;
- module_param_named(allhwsupport, modparam_allhwsupport, int, 0444);
- MODULE_PARM_DESC(allhwsupport, "Enable support for all hardware (even it if overlaps with the brcmsmac driver)");
- 

package/kernel/mac80211/patches/850-brcmsmac-remove-extra-regulation-restriction.patch

@@ -1,27 +0,0 @@
---- a/drivers/net/wireless/brcm80211/brcmsmac/channel.c
-+++ b/drivers/net/wireless/brcm80211/brcmsmac/channel.c
-@@ -58,19 +58,12 @@
- 				 (((c) < 149) ? 3 : 4))))
- 
- #define BRCM_2GHZ_2412_2462	REG_RULE(2412-10, 2462+10, 40, 0, 19, 0)
--#define BRCM_2GHZ_2467_2472	REG_RULE(2467-10, 2472+10, 20, 0, 19, \
--					 NL80211_RRF_NO_IR)
-+#define BRCM_2GHZ_2467_2472	REG_RULE(2467-10, 2472+10, 20, 0, 19, 0)
- 
--#define BRCM_5GHZ_5180_5240	REG_RULE(5180-10, 5240+10, 40, 0, 21, \
--					 NL80211_RRF_NO_IR)
--#define BRCM_5GHZ_5260_5320	REG_RULE(5260-10, 5320+10, 40, 0, 21, \
--					 NL80211_RRF_DFS | \
--					 NL80211_RRF_NO_IR)
--#define BRCM_5GHZ_5500_5700	REG_RULE(5500-10, 5700+10, 40, 0, 21, \
--					 NL80211_RRF_DFS | \
--					 NL80211_RRF_NO_IR)
--#define BRCM_5GHZ_5745_5825	REG_RULE(5745-10, 5825+10, 40, 0, 21, \
--					 NL80211_RRF_NO_IR)
-+#define BRCM_5GHZ_5180_5240	REG_RULE(5180-10, 5240+10, 40, 0, 21, 0)
-+#define BRCM_5GHZ_5260_5320	REG_RULE(5260-10, 5320+10, 40, 0, 21, 0)
-+#define BRCM_5GHZ_5500_5700	REG_RULE(5500-10, 5700+10, 40, 0, 21, 0)
-+#define BRCM_5GHZ_5745_5825	REG_RULE(5745-10, 5825+10, 40, 0, 21, 0)
- 
- static const struct ieee80211_regdomain brcms_regdom_x2 = {
- 	.n_reg_rules = 6,

package/kernel/mac80211/patches/900-wlcore-Add-support-for-DT-platform-data.patch

@@ -1,139 +0,0 @@
-When running with DT, we no longer have a board file that can set up the
-platform data for wlcore. Allow this data to be passed from DT.
-
-Since some platforms use a gpio-irq, add support for passing either the
-irq number or the gpio number. For the latter case, the driver will
-request the gpio and convert it to the irq number. If an irq is
-specified, it'll be used as is.
-
-[Arik - the pdev_data pointer does not belong to us and is freed when
-the device is released. Dereference to our private data first.]
-
-Signed-off-by: Ido Yariv <ido@wizery.com>
-Signed-off-by: Arik Nemtsov <arik@wizery.com>
----
- drivers/net/wireless/ti/wlcore/sdio.c | 71 ++++++++++++++++++++++++++++++++---
- include/linux/wl12xx.h                |  3 +-
- 2 files changed, 67 insertions(+), 7 deletions(-)
-
---- a/drivers/net/wireless/ti/wlcore/sdio.c
-+++ b/drivers/net/wireless/ti/wlcore/sdio.c
-@@ -34,6 +34,7 @@
- #include <linux/wl12xx.h>
- #include <linux/pm_runtime.h>
- #include <linux/printk.h>
-+#include <linux/of.h>
- 
- #include "wlcore.h"
- #include "wl12xx_80211.h"
-@@ -214,6 +215,61 @@ static struct wl1271_if_operations sdio_
- 	.set_block_size = wl1271_sdio_set_block_size,
- };
- 
-+static const struct of_device_id wlcore_of_match[] = {
-+	{
-+		.compatible = "wlcore",
-+	},
-+	{}
-+};
-+MODULE_DEVICE_TABLE(of, wlcore_of_match);
-+
-+static struct wl12xx_platform_data *get_platform_data(struct device *dev)
-+{
-+	struct wl12xx_platform_data *pdata;
-+	struct device_node *np;
-+	u32 gpio;
-+
-+	pdata = wl12xx_get_platform_data();
-+	if (!IS_ERR(pdata))
-+		return kmemdup(pdata, sizeof(*pdata), GFP_KERNEL);
-+
-+	np = of_find_matching_node(NULL, wlcore_of_match);
-+	if (!np) {
-+		dev_err(dev, "No platform data set\n");
-+		return NULL;
-+	}
-+
-+	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
-+	if (!pdata) {
-+		dev_err(dev, "Can't allocate platform data\n");
-+		return NULL;
-+	}
-+
-+	if (of_property_read_u32(np, "irq", &pdata->irq)) {
-+		if (!of_property_read_u32(np, "gpio", &gpio) &&
-+		    !gpio_request_one(gpio, GPIOF_IN, "wlcore_irq")) {
-+			pdata->gpio = gpio;
-+			pdata->irq = gpio_to_irq(gpio);
-+		}
-+	}
-+
-+	/* Optional fields */
-+	pdata->use_eeprom = of_property_read_bool(np, "use-eeprom");
-+	of_property_read_u32(np, "board-ref-clock", &pdata->board_ref_clock);
-+	of_property_read_u32(np, "board-tcxo-clock", &pdata->board_tcxo_clock);
-+	of_property_read_u32(np, "platform-quirks", &pdata->platform_quirks);
-+
-+	return pdata;
-+}
-+
-+static void del_platform_data(struct wl12xx_platform_data *pdata)
-+{
-+	if (pdata->gpio)
-+		gpio_free(pdata->gpio);
-+
-+	kfree(pdata);
-+}
-+
- static int wl1271_probe(struct sdio_func *func,
- 				  const struct sdio_device_id *id)
- {
-@@ -245,10 +301,10 @@ static int wl1271_probe(struct sdio_func
- 	/* Use block mode for transferring over one block size of data */
- 	func->card->quirks |= MMC_QUIRK_BLKSZ_FOR_BYTE_MODE;
- 
--	pdev_data.pdata = wl12xx_get_platform_data();
--	if (IS_ERR(pdev_data.pdata)) {
--		ret = PTR_ERR(pdev_data.pdata);
--		dev_err(glue->dev, "missing wlan platform data: %d\n", ret);
-+	pdev_data.pdata = get_platform_data(&func->dev);
-+	if (!pdev_data.pdata) {
-+		ret = -EINVAL;
-+		dev_err(glue->dev, "missing wlan platform data\n");
- 		goto out_free_glue;
- 	}
- 
-@@ -279,7 +335,7 @@ static int wl1271_probe(struct sdio_func
- 	if (!glue->core) {
- 		dev_err(glue->dev, "can't allocate platform_device");
- 		ret = -ENOMEM;
--		goto out_free_glue;
-+		goto out_free_pdata;
- 	}
- 
- 	glue->core->dev.parent = &func->dev;
-@@ -313,6 +369,9 @@ static int wl1271_probe(struct sdio_func
- out_dev_put:
- 	platform_device_put(glue->core);
- 
-+out_free_pdata:
-+	del_platform_data(pdev_data->pdata);
-+
- out_free_glue:
- 	kfree(glue);
- 
-@@ -323,11 +382,14 @@ out:
- static void wl1271_remove(struct sdio_func *func)
- {
- 	struct wl12xx_sdio_glue *glue = sdio_get_drvdata(func);
-+	struct wlcore_platdev_data *pdev_data = glue->core->dev.platform_data;
-+	struct wl12xx_platform_data *pdata = pdev_data->pdata;
- 
- 	/* Undo decrement done above in wl1271_probe */
- 	pm_runtime_get_noresume(&func->dev);
- 
- 	platform_device_unregister(glue->core);
-+	del_platform_data(pdata);
- 	kfree(glue);
- }
- 

package/kernel/mac80211/patches/910-00-rt2x00-enable-rt2800soc-for-mt7620.patch

@@ -1,20 +0,0 @@
---- a/drivers/net/wireless/rt2x00/Kconfig
-+++ b/drivers/net/wireless/rt2x00/Kconfig
-@@ -211,7 +211,7 @@ endif
- config RT2800SOC
- 	tristate "Ralink WiSoC support"
- 	depends on m
--	depends on SOC_RT288X || SOC_RT305X || SOC_RT3883
-+	depends on SOC_RT288X || SOC_RT305X || SOC_RT3883 || SOC_MT7620
- 	select RT2X00_LIB_SOC
- 	select RT2X00_LIB_MMIO
- 	select RT2X00_LIB_CRYPTO
-@@ -248,7 +248,7 @@ config RT2X00_LIB_PCI
- 
- config RT2X00_LIB_SOC
- 	tristate "RT2x00 SoC support"
--	depends on SOC_RT288X || SOC_RT305X || SOC_RT3883
-+	depends on SOC_RT288X || SOC_RT305X || SOC_RT3883 || SOC_MT7620
- 	depends on m
- 	select RT2X00_LIB
- 

package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch

@@ -1,1198 +0,0 @@
---- a/drivers/net/wireless/rt2x00/rt2800.h
-+++ b/drivers/net/wireless/rt2x00/rt2800.h
-@@ -81,6 +81,7 @@
- #define RF5372				0x5372
- #define RF5390				0x5390
- #define RF5392				0x5392
-+#define RF7620				0x7620
- 
- /*
-  * Chipset revisions.
-@@ -656,6 +657,14 @@
- #define RF_CSR_CFG_BUSY			FIELD32(0x00020000)
- 
- /*
-+ * mt7620 RF registers (reversed order)
-+ */
-+#define RF_CSR_CFG_DATA_MT7620		FIELD32(0x0000ff00)
-+#define RF_CSR_CFG_REGNUM_MT7620	FIELD32(0x03ff0000)
-+#define RF_CSR_CFG_WRITE_MT7620		FIELD32(0x00000010)
-+#define RF_CSR_CFG_BUSY_MT7620		FIELD32(0x00000001)
-+
-+/*
-  * EFUSE_CSR: RT30x0 EEPROM
-  */
- #define EFUSE_CTRL			0x0580
-@@ -1039,6 +1048,11 @@
- #define AUTOWAKEUP_CFG_AUTOWAKE		FIELD32(0x00008000)
- 
- /*
-+ * mt7620
-+ */
-+#define MIMO_PS_CFG			0x1210
-+
-+/*
-  * EDCA_AC0_CFG:
-  */
- #define EDCA_AC0_CFG			0x1300
-@@ -1218,6 +1232,8 @@
- #define TX_PIN_CFG_RFTR_POL		FIELD32(0x00020000)
- #define TX_PIN_CFG_TRSW_EN		FIELD32(0x00040000)
- #define TX_PIN_CFG_TRSW_POL		FIELD32(0x00080000)
-+#define TX_PIN_CFG_RFRX_EN		FIELD32(0x00100000) /* mt7620 */
-+#define TX_PIN_CFG_RFRX_POL		FIELD32(0x00200000) /* mt7620 */
- #define TX_PIN_CFG_PA_PE_A2_EN		FIELD32(0x01000000)
- #define TX_PIN_CFG_PA_PE_G2_EN		FIELD32(0x02000000)
- #define TX_PIN_CFG_PA_PE_A2_POL		FIELD32(0x04000000)
-@@ -1564,6 +1580,17 @@
- #define TX_PWR_CFG_4_EXT_STBC4_CH2	FIELD32(0x0000000f)
- #define TX_PWR_CFG_4_EXT_STBC6_CH2	FIELD32(0x00000f00)
- 
-+/* mt7620 */
-+#define TX0_RF_GAIN_CORRECT		0x13a0
-+#define TX1_RF_GAIN_CORRECT		0x13a4
-+#define TX0_RF_GAIN_ATTEN		0x13a8
-+#define TX1_RF_GAIN_ATTEN		0x13ac
-+#define TX_ALG_CFG_0			0x13b0
-+#define TX_ALG_CFG_1			0x13b4
-+#define TX0_BB_GAIN_ATTEN		0x13c0
-+#define TX1_BB_GAIN_ATTEN		0x13c4
-+#define TX_ALC_VGA3			0x13c8
-+
- /* TX_PWR_CFG_7 */
- #define TX_PWR_CFG_7			0x13d4
- #define TX_PWR_CFG_7_OFDM54_CH0		FIELD32(0x0000000f)
---- a/drivers/net/wireless/rt2x00/rt2800lib.c
-+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
-@@ -61,6 +61,8 @@
- 	rt2800_regbusy_read((__dev), BBP_CSR_CFG, BBP_CSR_CFG_BUSY, (__reg))
- #define WAIT_FOR_RFCSR(__dev, __reg) \
- 	rt2800_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY, (__reg))
-+#define WAIT_FOR_RFCSR_MT7620(__dev, __reg) \
-+	rt2800_regbusy_read((__dev), RF_CSR_CFG, RF_CSR_CFG_BUSY_MT7620, (__reg))
- #define WAIT_FOR_RF(__dev, __reg) \
- 	rt2800_regbusy_read((__dev), RF_CSR_CFG0, RF_CSR_CFG0_BUSY, (__reg))
- #define WAIT_FOR_MCU(__dev, __reg) \
-@@ -186,19 +188,55 @@ static void rt2800_rfcsr_write(struct rt
- 	 * Wait until the RFCSR becomes available, afterwards we
- 	 * can safely write the new data into the register.
- 	 */
--	if (WAIT_FOR_RFCSR(rt2x00dev, &reg)) {
--		reg = 0;
--		rt2x00_set_field32(&reg, RF_CSR_CFG_DATA, value);
--		rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word);
--		rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 1);
--		rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1);
-+	switch (rt2x00dev->chip.rf) {
-+	case RF7620:
-+		if (WAIT_FOR_RFCSR_MT7620(rt2x00dev, &reg)) {
-+			reg = 0;
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_DATA_MT7620, value);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM_MT7620, word);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE_MT7620, 1);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY_MT7620, 1);
-+
-+			rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
-+		}
-+		break;
-+
-+	default:
-+		if (WAIT_FOR_RFCSR(rt2x00dev, &reg)) {
-+			reg = 0;
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_DATA, value);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 1);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1);
- 
--		rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
-+			rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
-+		}
-+		break;
- 	}
- 
- 	mutex_unlock(&rt2x00dev->csr_mutex);
- }
- 
-+static void rt2800_rfcsr_write_bank(struct rt2x00_dev *rt2x00dev, const u8 bank,
-+				    const unsigned int reg, const u8 value)
-+{
-+	rt2800_rfcsr_write(rt2x00dev, (reg | (bank << 6)), value);
-+}
-+
-+static void rt2800_rfcsr_write_chanreg(struct rt2x00_dev *rt2x00dev,
-+				       const unsigned int reg, const u8 value)
-+{
-+	rt2800_rfcsr_write_bank(rt2x00dev, 4, reg, value);
-+	rt2800_rfcsr_write_bank(rt2x00dev, 6, reg, value);
-+}
-+
-+static void rt2800_rfcsr_write_dccal(struct rt2x00_dev *rt2x00dev,
-+				     const unsigned int reg, const u8 value)
-+{
-+	rt2800_rfcsr_write_bank(rt2x00dev, 5, reg, value);
-+	rt2800_rfcsr_write_bank(rt2x00dev, 7, reg, value);
-+}
-+
- static void rt2800_rfcsr_read(struct rt2x00_dev *rt2x00dev,
- 			      const unsigned int word, u8 *value)
- {
-@@ -214,22 +252,47 @@ static void rt2800_rfcsr_read(struct rt2
- 	 * doesn't become available in time, reg will be 0xffffffff
- 	 * which means we return 0xff to the caller.
- 	 */
--	if (WAIT_FOR_RFCSR(rt2x00dev, &reg)) {
--		reg = 0;
--		rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word);
--		rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 0);
--		rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1);
-+	switch (rt2x00dev->chip.rf) {
-+	case RF7620:
-+		if (WAIT_FOR_RFCSR_MT7620(rt2x00dev, &reg)) {
-+			reg = 0;
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM_MT7620, word);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE_MT7620, 0);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY_MT7620, 1);
- 
--		rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
-+			rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
- 
--		WAIT_FOR_RFCSR(rt2x00dev, &reg);
--	}
-+			WAIT_FOR_RFCSR_MT7620(rt2x00dev, &reg);
-+		}
- 
--	*value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA);
-+		*value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA_MT7620);
-+		break;
-+
-+	default:
-+		if (WAIT_FOR_RFCSR(rt2x00dev, &reg)) {
-+			reg = 0;
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_REGNUM, word);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_WRITE, 0);
-+			rt2x00_set_field32(&reg, RF_CSR_CFG_BUSY, 1);
-+
-+			rt2800_register_write_lock(rt2x00dev, RF_CSR_CFG, reg);
-+
-+			WAIT_FOR_RFCSR(rt2x00dev, &reg);
-+		}
-+
-+		*value = rt2x00_get_field32(reg, RF_CSR_CFG_DATA);
-+		break;
-+	}
- 
- 	mutex_unlock(&rt2x00dev->csr_mutex);
- }
- 
-+static void rt2800_rfcsr_read_bank(struct rt2x00_dev *rt2x00dev, const u8 bank,
-+				   const unsigned int reg, u8 *value)
-+{
-+	rt2800_rfcsr_read(rt2x00dev, (reg | (bank << 6)), value);
-+}
-+
- static void rt2800_rf_write(struct rt2x00_dev *rt2x00dev,
- 			    const unsigned int word, const u32 value)
- {
-@@ -566,6 +629,13 @@ void rt2800_get_txwi_rxwi_size(struct rt
- 		*rxwi_size = RXWI_DESC_SIZE_5WORDS;
- 		break;
- 
-+	case RT5390:
-+		if ( rt2x00dev->chip.rf == RF7620 ) {
-+			*txwi_size = TXWI_DESC_SIZE_5WORDS;
-+			*rxwi_size = RXWI_DESC_SIZE_6WORDS;
-+		}
-+		break;
-+
- 	case RT5592:
- 		*txwi_size = TXWI_DESC_SIZE_5WORDS;
- 		*rxwi_size = RXWI_DESC_SIZE_6WORDS;
-@@ -3326,6 +3396,312 @@ static void rt2800_config_channel_rf55xx
- 	rt2800_bbp_write(rt2x00dev, 196, (rf->channel <= 14) ? 0x19 : 0x7F);
- }
- 
-+typedef struct mt7620_freqconfig {
-+	u8	Channel;
-+	u8	Rdiv;
-+	u16	N;
-+	u8	K;
-+	u8	D;
-+	u32	Ksd;
-+} mt7620_freqconfig;
-+
-+mt7620_freqconfig mt7620_chanconfig[] =
-+{
-+	/* 2.4 to 2.483 GHz
-+	 * CH	Rdiv	N	K	D	Ksd */
-+	{ 0,	0,	0,	0,	0,	0	},
-+	{ 1,	3,	0x50,	0,	0,	0x19999	},
-+	{ 2,	3,	0x50,	0,	0,	0x24444	},
-+	{ 3,	3,	0x50,	0,	0,	0x2EEEE	},
-+	{ 4,	3,	0x50,	0,	0,	0x39999	},
-+	{ 5,	3,	0x51,	0,	0,	0x04444	},
-+	{ 6,	3,	0x51,	0,	0,	0x0EEEE	},
-+	{ 7,	3,	0x51,	0,	0,	0x19999	},
-+	{ 8,	3,	0x51,	0,	0,	0x24444	},
-+	{ 9,	3,	0x51,	0,	0,	0x2EEEE	},
-+	{ 10,	3,	0x51,	0,	0,	0x39999	},
-+	{ 11,	3,	0x52,	0,	0,	0x04444	},
-+	{ 12,	3,	0x52,	0,	0,	0x0EEEE	},
-+	{ 13,	3,	0x52,	0,	0,	0x19999	},
-+	{ 14,	3,	0x52,	0,	0,	0x33333	},
-+};
-+
-+static void rt2800_config_channel_rf7620(struct rt2x00_dev *rt2x00dev,
-+					 struct ieee80211_conf *conf,
-+					 struct rf_channel *rf,
-+					 struct channel_info *info)
-+{
-+	int i;
-+	u8 bbp;
-+	u8 rfcsr;
-+	u8 txrx_agc_fc;
-+	u32 reg;
-+	u16 eeprom, target_power;
-+	u32 mac_sys_ctrl, mac_status;
-+	u32 tx_pin = 0x00150F0F;
-+	struct hw_mode_spec *spec = &rt2x00dev->spec;
-+
-+	/* Frequeny plan setting */
-+	/*	
-+	  * Rdiv setting
-+	  * R13[1:0] 
-+	  */
-+	rt2800_rfcsr_read(rt2x00dev, 13, &rfcsr);
-+	rfcsr = rfcsr & (~0x03);
-+	if (spec->clk_is_20mhz)
-+		rfcsr |= (mt7620_chanconfig[rf->channel].Rdiv & 0x3);
-+	rt2800_rfcsr_write(rt2x00dev, 13, rfcsr);
-+
-+	/*  
-+	 * N setting
-+	 * R21[0], R20[7:0] 
-+	 */
-+	rt2800_rfcsr_read(rt2x00dev, 20, &rfcsr);
-+	rfcsr = (mt7620_chanconfig[rf->channel].N & 0x00ff);
-+	rt2800_rfcsr_write(rt2x00dev, 20, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 21, &rfcsr);
-+	rfcsr = rfcsr & (~0x01);
-+	rfcsr |= ((mt7620_chanconfig[rf->channel].N & 0x0100) >> 8);
-+	rt2800_rfcsr_write(rt2x00dev, 21, rfcsr);
-+
-+	/* 
-+	 * K setting 
-+	 * R16[3:0] (RF PLL freq selection)
-+	 */
-+	rt2800_rfcsr_read(rt2x00dev, 16, &rfcsr);
-+	rfcsr = rfcsr & (~0x0f);
-+	rfcsr |= (mt7620_chanconfig[rf->channel].K & 0x0f);
-+	rt2800_rfcsr_write(rt2x00dev, 16, rfcsr);
-+
-+	/* 
-+	 * D setting 
-+	 * R22[2:0] (D=15, R22[2:0]=<111>)
-+	 */
-+	rt2800_rfcsr_read(rt2x00dev, 22, &rfcsr);
-+	rfcsr = rfcsr & (~0x07);
-+	rfcsr |= (mt7620_chanconfig[rf->channel].D & 0x07);
-+	rt2800_rfcsr_write(rt2x00dev, 22, rfcsr);
-+
-+	/*	
-+	 * Ksd setting
-+	 * Ksd: R19<1:0>,R18<7:0>,R17<7:0>
-+	 */
-+	rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
-+	rfcsr = (mt7620_chanconfig[rf->channel].Ksd & 0x000000ff);
-+	rt2800_rfcsr_write(rt2x00dev, 17, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 18, &rfcsr);
-+	rfcsr = ((mt7620_chanconfig[rf->channel].Ksd & 0x0000ff00) >> 8);
-+	rt2800_rfcsr_write(rt2x00dev, 18, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 19, &rfcsr);
-+	rfcsr = rfcsr & (~0x03);
-+	rfcsr |= ((mt7620_chanconfig[rf->channel].Ksd & 0x00030000) >> 16);
-+	rt2800_rfcsr_write(rt2x00dev, 19, rfcsr);
-+
-+	/* Default: XO=20MHz , SDM mode */
-+	rt2800_rfcsr_read(rt2x00dev, 16, &rfcsr);
-+	rfcsr = rfcsr & (~0xE0);
-+	rfcsr |= 0x80;
-+	rt2800_rfcsr_write(rt2x00dev, 16, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 21, &rfcsr);
-+	rfcsr |= 0x80;
-+	rt2800_rfcsr_write(rt2x00dev, 21, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 1, &rfcsr);
-+	if (rt2x00dev->default_ant.tx_chain_num == 1)
-+		rfcsr &= (~0x2);
-+	else
-+		rfcsr |= 0x2;
-+	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);
-+	if (rt2x00dev->default_ant.tx_chain_num == 1)
-+		rfcsr &= (~0x20);
-+	else
-+		rfcsr |= 0x20;
-+	if (rt2x00dev->default_ant.rx_chain_num == 1)
-+		rfcsr &= (~0x02);
-+	else
-+		rfcsr |= 0x02;
-+	rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);
-+
-+	rt2800_rfcsr_read(rt2x00dev, 42, &rfcsr);
-+	if (rt2x00dev->default_ant.tx_chain_num == 1)
-+		rfcsr &= (~0x40);
-+	else
-+		rfcsr |= 0x40;
-+	rt2800_rfcsr_write(rt2x00dev, 42, rfcsr);
-+
-+	/* RF for DC Cal BW */
-+	if (conf_is_ht40(conf)) {
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 6, 0x10);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 7, 0x10);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 8, 0x04);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x10);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x10);
-+	} else {
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 6, 0x20);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 7, 0x20);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 8, 0x00);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x20);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x20);
-+	}
-+
-+	if (conf_is_ht40(conf)) {
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x08);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x08);
-+	} else {
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x28);
-+		rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x28);
-+	}
-+
-+	rt2800_rfcsr_read(rt2x00dev, 28, &rfcsr);
-+	if (conf_is_ht40(conf) && (rf->channel == 11))
-+		rfcsr |= 0x4;
-+	else
-+		rfcsr &= (~0x4);
-+	rt2800_rfcsr_write(rt2x00dev, 28, rfcsr);
-+
-+	struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
-+	/*if (bScan == FALSE)*/
-+	if (conf_is_ht40(conf)) {
-+		txrx_agc_fc = rt2x00_get_field8(drv_data->calibration_bw40,
-+						RFCSR24_TX_AGC_FC);
-+	} else {
-+		txrx_agc_fc = rt2x00_get_field8(drv_data->calibration_bw20,
-+						RFCSR24_TX_AGC_FC);		
-+	}
-+	rt2800_rfcsr_read_bank(rt2x00dev, 5, 6, &rfcsr);
-+	rfcsr &= (~0x3F);
-+	rfcsr |= txrx_agc_fc;
-+	rt2800_rfcsr_write_bank(rt2x00dev, 5, 6, rfcsr);
-+	rt2800_rfcsr_read_bank(rt2x00dev, 5, 7, &rfcsr);
-+	rfcsr &= (~0x3F);
-+	rfcsr |= txrx_agc_fc;
-+	rt2800_rfcsr_write_bank(rt2x00dev, 5, 7, rfcsr);
-+	rt2800_rfcsr_read_bank(rt2x00dev, 7, 6, &rfcsr);
-+	rfcsr &= (~0x3F);
-+	rfcsr |= txrx_agc_fc;
-+	rt2800_rfcsr_write_bank(rt2x00dev, 7, 6, rfcsr);
-+	rt2800_rfcsr_read_bank(rt2x00dev, 7, 7, &rfcsr);
-+	rfcsr &= (~0x3F);
-+	rfcsr |= txrx_agc_fc;
-+	rt2800_rfcsr_write_bank(rt2x00dev, 7, 7, rfcsr);
-+
-+	rt2800_rfcsr_read_bank(rt2x00dev, 5, 58, &rfcsr);
-+	rfcsr &= (~0x3F);
-+	rfcsr |= txrx_agc_fc;
-+	rt2800_rfcsr_write_bank(rt2x00dev, 5, 58, rfcsr);
-+	rt2800_rfcsr_read_bank(rt2x00dev, 5, 59, &rfcsr);
-+	rfcsr &= (~0x3F);
-+	rfcsr |= txrx_agc_fc;
-+	rt2800_rfcsr_write_bank(rt2x00dev, 5, 59, rfcsr);
-+	rt2800_rfcsr_read_bank(rt2x00dev, 7, 58, &rfcsr);
-+	rfcsr &= (~0x3F);
-+	rfcsr |= txrx_agc_fc;
-+	rt2800_rfcsr_write_bank(rt2x00dev, 7, 58, rfcsr);
-+	rt2800_rfcsr_read_bank(rt2x00dev, 7, 59, &rfcsr);
-+	rfcsr &= (~0x3F);
-+	rfcsr |= txrx_agc_fc;
-+	rt2800_rfcsr_write_bank(rt2x00dev, 7, 59, rfcsr);
-+
-+	rt2800_register_read(rt2x00dev, TX_ALG_CFG_0, &reg);
-+	reg = reg & (~0x3F3F);
-+	reg |= info->default_power1;
-+	reg |= (info->default_power2 << 8);
-+	reg |= (0x2F << 16);
-+	reg |= (0x2F << 24);
-+
-+	rt2800_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
-+	if (rt2x00_get_field16(eeprom, EEPROM_NIC_CONF1_INTERNAL_TX_ALC)) {
-+		/* init base power by e2p target power */
-+		rt2800_eeprom_read(rt2x00dev, 0xD0, &target_power);
-+		target_power &= 0x3F;
-+		reg = reg & (~0x3F3F);
-+		reg |= target_power;
-+		reg |= (target_power << 8);
-+	}
-+	rt2800_register_write(rt2x00dev, TX_ALG_CFG_0, reg);
-+
-+	rt2800_register_read(rt2x00dev, TX_ALG_CFG_1, &reg);
-+	reg = reg & (~0x3F);
-+	rt2800_register_write(rt2x00dev, TX_ALG_CFG_1, reg);
-+
-+	/*if (bScan == FALSE)*/
-+	/* Save MAC SYS CTRL registers */
-+	rt2800_register_read(rt2x00dev, MAC_SYS_CTRL, &mac_sys_ctrl);
-+	/* Disable Tx/Rx */
-+	rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, 0);
-+	/* Check MAC Tx/Rx idle */
-+	for (i = 0; i < 10000; i++) {
-+		rt2800_register_read(rt2x00dev, MAC_STATUS_CFG, &mac_status);
-+		if (mac_status & 0x3)
-+			udelay(50);
-+		else
-+			break;
-+	}
-+
-+	if (i == 10000)
-+		rt2x00_warn(rt2x00dev, "Wait MAC Status to MAX !!!\n");
-+
-+	if (rf->channel > 10) {
-+		rt2800_bbp_read(rt2x00dev, 30, &bbp);
-+		bbp = 0x40;
-+		rt2800_bbp_write(rt2x00dev, 30, bbp);
-+		rt2800_rfcsr_write(rt2x00dev, 39, 0);
-+		rt2800_rfcsr_write(rt2x00dev, 42, 0x7b);
-+	} else {
-+		rt2800_bbp_read(rt2x00dev, 30, &bbp);
-+		bbp = 0x1f;
-+		rt2800_bbp_write(rt2x00dev, 30, bbp);
-+		rt2800_rfcsr_write(rt2x00dev, 39, 0x80);
-+		rt2800_rfcsr_write(rt2x00dev, 42, 0x5b);
-+	}
-+
-+	rt2800_register_write(rt2x00dev, MAC_SYS_CTRL, mac_sys_ctrl);
-+
-+	rt2800_rfcsr_write(rt2x00dev, 5, 0x40);
-+	rt2800_rfcsr_write(rt2x00dev, 4, 0x0C);
-+
-+	/* vcocal_en (initiate VCO calibration (reset after completion)) */
-+	rt2800_rfcsr_read(rt2x00dev, 4, &rfcsr);
-+	rfcsr = ((rfcsr & ~0x80) | 0x80);
-+	rt2800_rfcsr_write(rt2x00dev, 4, rfcsr);
-+	mdelay(2);
-+
-+	rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
-+
-+	if (rt2x00dev->default_ant.tx_chain_num == 1) {
-+		rt2800_bbp_write(rt2x00dev, 91, 0x07);
-+		rt2800_bbp_write(rt2x00dev, 95, 0x1A);
-+		rt2800_bbp_write(rt2x00dev, 195, 128);
-+		rt2800_bbp_write(rt2x00dev, 196, 0xA0);
-+		rt2800_bbp_write(rt2x00dev, 195, 170);
-+		rt2800_bbp_write(rt2x00dev, 196, 0x12);
-+		rt2800_bbp_write(rt2x00dev, 195, 171);
-+		rt2800_bbp_write(rt2x00dev, 196, 0x10);		
-+	} else {
-+		rt2800_bbp_write(rt2x00dev, 91, 0x06);
-+		rt2800_bbp_write(rt2x00dev, 95, 0x9A);
-+		rt2800_bbp_write(rt2x00dev, 195, 128);
-+		rt2800_bbp_write(rt2x00dev, 196, 0xE0);
-+		rt2800_bbp_write(rt2x00dev, 195, 170);
-+		rt2800_bbp_write(rt2x00dev, 196, 0x30);
-+		rt2800_bbp_write(rt2x00dev, 195, 171);
-+		rt2800_bbp_write(rt2x00dev, 196, 0x30);
-+	}
-+
-+	/* On 11A, We should delay and wait RF/BBP to be stable*/
-+	/* and the appropriate time should be 1000 micro seconds */
-+	/* 2005/06/05 - On 11G, We also need this delay time.
-+	 * Otherwise it's difficult to pass the WHQL.*/
-+	udelay(1000);
-+}
-+
-+
- static void rt2800_bbp_write_with_rx_chain(struct rt2x00_dev *rt2x00dev,
- 					   const unsigned int word,
- 					   const u8 value)
-@@ -3482,7 +3858,7 @@ static void rt2800_config_channel(struct
- 				  struct channel_info *info)
- {
- 	u32 reg;
--	unsigned int tx_pin;
-+	u32 tx_pin;
- 	u8 bbp, rfcsr;
- 
- 	info->default_power1 = rt2800_txpower_to_dev(rt2x00dev, rf->channel,
-@@ -3536,6 +3912,9 @@ static void rt2800_config_channel(struct
- 	case RF5592:
- 		rt2800_config_channel_rf55xx(rt2x00dev, conf, rf, info);
- 		break;
-+	case RF7620:
-+		rt2800_config_channel_rf7620(rt2x00dev, conf, rf, info);
-+		break;
- 	default:
- 		rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
- 	}
-@@ -3638,7 +4017,7 @@ static void rt2800_config_channel(struct
- 		else if (rt2x00_rt(rt2x00dev, RT3593) ||
- 			 rt2x00_rt(rt2x00dev, RT3883))
- 			rt2800_bbp_write(rt2x00dev, 82, 0x82);
--		else
-+		else if (rt2x00dev->chip.rf != RF7620)
- 			rt2800_bbp_write(rt2x00dev, 82, 0xf2);
- 
- 		if (rt2x00_rt(rt2x00dev, RT3593) ||
-@@ -3660,7 +4039,7 @@ static void rt2800_config_channel(struct
- 	if (rt2x00_rt(rt2x00dev, RT3572))
- 		rt2800_rfcsr_write(rt2x00dev, 8, 0);
- 
--	tx_pin = 0;
-+	rt2800_register_read(rt2x00dev, TX_PIN_CFG, &tx_pin);
- 
- 	switch (rt2x00dev->default_ant.tx_chain_num) {
- 	case 3:
-@@ -3709,6 +4088,7 @@ static void rt2800_config_channel(struct
- 
- 	rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFTR_EN, 1);
- 	rt2x00_set_field32(&tx_pin, TX_PIN_CFG_TRSW_EN, 1);
-+	rt2x00_set_field32(&tx_pin, TX_PIN_CFG_RFRX_EN, 1); /* mt7620 */
- 
- 	rt2800_register_write(rt2x00dev, TX_PIN_CFG, tx_pin);
- 
-@@ -4718,6 +5098,14 @@ void rt2800_vco_calibration(struct rt2x0
- 		rt2x00_set_field8(&rfcsr, RFCSR3_VCOCAL_EN, 1);
- 		rt2800_rfcsr_write(rt2x00dev, 3, rfcsr);
- 		break;
-+	case RF7620:
-+		rt2800_rfcsr_read(rt2x00dev, 4, &rfcsr);
-+		/* vcocal_en (initiate VCO calibration (reset after completion))
-+		 * It should be at the end of RF configuration. */
-+		rfcsr = ((rfcsr & ~0x80) | 0x80); 
-+		rt2800_rfcsr_write(rt2x00dev, 4, rfcsr);
-+		mdelay(1);
-+		break;
- 	default:
- 		return;
- 	}
-@@ -5118,9 +5506,42 @@ static int rt2800_init_registers(struct 
- 	} else if (rt2x00_rt(rt2x00dev, RT5390) ||
- 		   rt2x00_rt(rt2x00dev, RT5392) ||
- 		   rt2x00_rt(rt2x00dev, RT5592)) {
--		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
--		rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
--		rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
-+		if (rt2x00dev->chip.rf == RF7620) {
-+			rt2800_register_write(rt2x00dev, TX_SW_CFG0,
-+							0x00000401);
-+			rt2800_register_write(rt2x00dev, TX_SW_CFG1,
-+							0x000C0000);
-+			rt2800_register_write(rt2x00dev, TX_SW_CFG2,
-+							0x00000000);
-+			rt2800_register_write(rt2x00dev, MIMO_PS_CFG,
-+							0x00000002);
-+			rt2800_register_write(rt2x00dev, TX_PIN_CFG,
-+							0x00150F0F);
-+			rt2800_register_write(rt2x00dev, TX_ALC_VGA3,
-+							0x06060606);
-+			rt2800_register_write(rt2x00dev, TX0_BB_GAIN_ATTEN,
-+							0x0);
-+			rt2800_register_write(rt2x00dev, TX1_BB_GAIN_ATTEN,
-+							0x0);
-+			rt2800_register_write(rt2x00dev, TX0_RF_GAIN_ATTEN,
-+							0x6C6C666C);
-+			rt2800_register_write(rt2x00dev, TX1_RF_GAIN_ATTEN,
-+							0x6C6C666C);
-+			rt2800_register_write(rt2x00dev, TX0_RF_GAIN_CORRECT,
-+							0x3630363A);
-+			rt2800_register_write(rt2x00dev, TX1_RF_GAIN_CORRECT,
-+							0x3630363A);
-+			rt2800_register_read(rt2x00dev, TX_ALG_CFG_1, &reg);
-+			reg = reg & (~0x80000000);
-+			rt2800_register_write(rt2x00dev, TX_ALG_CFG_1, reg);
-+		} else {
-+			rt2800_register_write(rt2x00dev, TX_SW_CFG0,
-+							0x00000404);
-+			rt2800_register_write(rt2x00dev, TX_SW_CFG1,
-+							0x00080606);
-+			rt2800_register_write(rt2x00dev, TX_SW_CFG2,
-+							0x00000000);
-+		}
- 	} else if (rt2x00_rt(rt2x00dev, RT5350)) {
- 		rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);
- 	} else {
-@@ -6152,6 +6573,225 @@ static void rt2800_init_bbp_5592(struct 
- 		rt2800_bbp_write(rt2x00dev, 103, 0xc0);
- }
- 
-+static void rt2800_bbp_glrt_write(struct rt2x00_dev *rt2x00dev,
-+				  const u8 reg, const u8 value)
-+{
-+	rt2800_bbp_write(rt2x00dev, 195, reg);
-+	rt2800_bbp_write(rt2x00dev, 196, value);
-+}
-+
-+static void rt2800_bbp_dcoc_write(struct rt2x00_dev *rt2x00dev,
-+				  const u8 reg, const u8 value)
-+{
-+	rt2800_bbp_write(rt2x00dev, 158, reg);
-+	rt2800_bbp_write(rt2x00dev, 159, value);
-+}
-+
-+static void rt2800_init_bbp_7620(struct rt2x00_dev *rt2x00dev)
-+{
-+	u8 bbp;
-+
-+	/* Apply Maximum Likelihood Detection (MLD) for 2 stream case */
-+	rt2800_bbp_read(rt2x00dev, 105, &bbp);
-+	rt2x00_set_field8(&bbp, BBP105_MLD,
-+			  rt2x00dev->default_ant.rx_chain_num == 2);
-+	rt2800_bbp_write(rt2x00dev, 105, bbp);
-+
-+	/* Avoid data loss and CRC errors */
-+	/* MAC interface control (MAC_IF_80M, 1: 80 MHz) */
-+	rt2800_bbp4_mac_if_ctrl(rt2x00dev);
-+
-+	/* Fix I/Q swap issue */
-+	rt2800_bbp_read(rt2x00dev, 1, &bbp);
-+	bbp |= 0x04;
-+	rt2800_bbp_write(rt2x00dev, 1, bbp);
-+
-+	/* BBP for G band */
-+	rt2800_bbp_write(rt2x00dev, 3, 0x08);
-+	rt2800_bbp_write(rt2x00dev, 4, 0x00); /* rt2800_bbp4_mac_if_ctrl? */
-+	rt2800_bbp_write(rt2x00dev, 6, 0x08);
-+	rt2800_bbp_write(rt2x00dev, 14, 0x09);
-+	rt2800_bbp_write(rt2x00dev, 15, 0xFF);
-+	rt2800_bbp_write(rt2x00dev, 16, 0x01);
-+	rt2800_bbp_write(rt2x00dev, 20, 0x06);
-+	rt2800_bbp_write(rt2x00dev, 21, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 22, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 27, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 28, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 30, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 31, 0x48);
-+	rt2800_bbp_write(rt2x00dev, 47, 0x40);
-+	rt2800_bbp_write(rt2x00dev, 62, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 63, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 64, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 65, 0x2C);
-+	rt2800_bbp_write(rt2x00dev, 66, 0x1C);
-+	rt2800_bbp_write(rt2x00dev, 67, 0x20);
-+	rt2800_bbp_write(rt2x00dev, 68, 0xDD);
-+	rt2800_bbp_write(rt2x00dev, 69, 0x10);
-+	rt2800_bbp_write(rt2x00dev, 70, 0x05);
-+	rt2800_bbp_write(rt2x00dev, 73, 0x18);
-+	rt2800_bbp_write(rt2x00dev, 74, 0x0F);
-+	rt2800_bbp_write(rt2x00dev, 75, 0x60);
-+	rt2800_bbp_write(rt2x00dev, 76, 0x44);
-+	rt2800_bbp_write(rt2x00dev, 77, 0x59);
-+	rt2800_bbp_write(rt2x00dev, 78, 0x1E);
-+	rt2800_bbp_write(rt2x00dev, 79, 0x1C);
-+	rt2800_bbp_write(rt2x00dev, 80, 0x0C);
-+	rt2800_bbp_write(rt2x00dev, 81, 0x3A);
-+	rt2800_bbp_write(rt2x00dev, 82, 0xB6);
-+	rt2800_bbp_write(rt2x00dev, 83, 0x9A);
-+	rt2800_bbp_write(rt2x00dev, 84, 0x9A);
-+	rt2800_bbp_write(rt2x00dev, 86, 0x38);
-+	rt2800_bbp_write(rt2x00dev, 88, 0x90);
-+	rt2800_bbp_write(rt2x00dev, 91, 0x04);
-+	rt2800_bbp_write(rt2x00dev, 92, 0x02);
-+	rt2800_bbp_write(rt2x00dev, 95, 0x9A);
-+	rt2800_bbp_write(rt2x00dev, 96, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 103, 0xC0);
-+	rt2800_bbp_write(rt2x00dev, 104, 0x92);
-+	/* FIXME BBP105 owerwrite */
-+	rt2800_bbp_write(rt2x00dev, 105, 0x3C);
-+	rt2800_bbp_write(rt2x00dev, 106, 0x12);
-+	rt2800_bbp_write(rt2x00dev, 109, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 134, 0x10);
-+	rt2800_bbp_write(rt2x00dev, 135, 0xA6);
-+	rt2800_bbp_write(rt2x00dev, 137, 0x04);
-+	rt2800_bbp_write(rt2x00dev, 142, 0x30);
-+	rt2800_bbp_write(rt2x00dev, 143, 0xF7);
-+	rt2800_bbp_write(rt2x00dev, 160, 0xEC);
-+	rt2800_bbp_write(rt2x00dev, 161, 0xC4);
-+	rt2800_bbp_write(rt2x00dev, 162, 0x77);
-+	rt2800_bbp_write(rt2x00dev, 163, 0xF9);
-+	rt2800_bbp_write(rt2x00dev, 164, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 165, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 186, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 187, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 188, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 186, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 187, 0x01);
-+	rt2800_bbp_write(rt2x00dev, 188, 0x00);
-+	rt2800_bbp_write(rt2x00dev, 189, 0x00);
-+
-+	rt2800_bbp_write(rt2x00dev, 91, 0x06);
-+	rt2800_bbp_write(rt2x00dev, 92, 0x04);
-+	rt2800_bbp_write(rt2x00dev, 93, 0x54);
-+	rt2800_bbp_write(rt2x00dev, 99, 0x50);
-+	rt2800_bbp_write(rt2x00dev, 148, 0x84);
-+	rt2800_bbp_write(rt2x00dev, 167, 0x80);
-+	rt2800_bbp_write(rt2x00dev, 178, 0xFF);
-+	rt2800_bbp_write(rt2x00dev, 106, 0x13);
-+
-+	/* BBP for G band GLRT function (BBP_128 ~ BBP_221) */
-+	rt2800_bbp_glrt_write(rt2x00dev, 0, 0x00);
-+	rt2800_bbp_glrt_write(rt2x00dev, 1, 0x14); /* ? see above */
-+	rt2800_bbp_glrt_write(rt2x00dev, 2, 0x20);
-+	rt2800_bbp_glrt_write(rt2x00dev, 3, 0x0A);
-+	rt2800_bbp_glrt_write(rt2x00dev, 10, 0x16);
-+	rt2800_bbp_glrt_write(rt2x00dev, 11, 0x06);
-+	rt2800_bbp_glrt_write(rt2x00dev, 12, 0x02);
-+	rt2800_bbp_glrt_write(rt2x00dev, 13, 0x07);
-+	rt2800_bbp_glrt_write(rt2x00dev, 14, 0x05);
-+	rt2800_bbp_glrt_write(rt2x00dev, 15, 0x09);
-+	rt2800_bbp_glrt_write(rt2x00dev, 16, 0x20);
-+	rt2800_bbp_glrt_write(rt2x00dev, 17, 0x08);
-+	rt2800_bbp_glrt_write(rt2x00dev, 18, 0x4A);
-+	rt2800_bbp_glrt_write(rt2x00dev, 19, 0x00);
-+	rt2800_bbp_glrt_write(rt2x00dev, 20, 0x00);
-+	rt2800_bbp_glrt_write(rt2x00dev, 128, 0xE0);
-+	rt2800_bbp_glrt_write(rt2x00dev, 129, 0x1F);
-+	rt2800_bbp_glrt_write(rt2x00dev, 130, 0x4F);
-+	rt2800_bbp_glrt_write(rt2x00dev, 131, 0x32);
-+	rt2800_bbp_glrt_write(rt2x00dev, 132, 0x08);
-+	rt2800_bbp_glrt_write(rt2x00dev, 133, 0x28);
-+	rt2800_bbp_glrt_write(rt2x00dev, 134, 0x19);
-+	rt2800_bbp_glrt_write(rt2x00dev, 135, 0x0A);
-+	rt2800_bbp_glrt_write(rt2x00dev, 138, 0x16);
-+	rt2800_bbp_glrt_write(rt2x00dev, 139, 0x10);
-+	rt2800_bbp_glrt_write(rt2x00dev, 140, 0x10);
-+	rt2800_bbp_glrt_write(rt2x00dev, 141, 0x1A);
-+	rt2800_bbp_glrt_write(rt2x00dev, 142, 0x36);
-+	rt2800_bbp_glrt_write(rt2x00dev, 143, 0x2C);
-+	rt2800_bbp_glrt_write(rt2x00dev, 144, 0x26);
-+	rt2800_bbp_glrt_write(rt2x00dev, 145, 0x24);
-+	rt2800_bbp_glrt_write(rt2x00dev, 146, 0x42);
-+	rt2800_bbp_glrt_write(rt2x00dev, 147, 0x40);
-+	rt2800_bbp_glrt_write(rt2x00dev, 148, 0x30);
-+	rt2800_bbp_glrt_write(rt2x00dev, 149, 0x29);
-+	rt2800_bbp_glrt_write(rt2x00dev, 150, 0x4C);
-+	rt2800_bbp_glrt_write(rt2x00dev, 151, 0x46);
-+	rt2800_bbp_glrt_write(rt2x00dev, 152, 0x3D);
-+	rt2800_bbp_glrt_write(rt2x00dev, 153, 0x40);
-+	rt2800_bbp_glrt_write(rt2x00dev, 154, 0x3E);
-+	rt2800_bbp_glrt_write(rt2x00dev, 155, 0x38);
-+	rt2800_bbp_glrt_write(rt2x00dev, 156, 0x3D);
-+	rt2800_bbp_glrt_write(rt2x00dev, 157, 0x2F);
-+	rt2800_bbp_glrt_write(rt2x00dev, 158, 0x3C);
-+	rt2800_bbp_glrt_write(rt2x00dev, 159, 0x34);
-+	rt2800_bbp_glrt_write(rt2x00dev, 160, 0x2C);
-+	rt2800_bbp_glrt_write(rt2x00dev, 161, 0x2F);
-+	rt2800_bbp_glrt_write(rt2x00dev, 162, 0x3C);
-+	rt2800_bbp_glrt_write(rt2x00dev, 163, 0x35);
-+	rt2800_bbp_glrt_write(rt2x00dev, 164, 0x2E);
-+	rt2800_bbp_glrt_write(rt2x00dev, 165, 0x2F);
-+	rt2800_bbp_glrt_write(rt2x00dev, 166, 0x49);
-+	rt2800_bbp_glrt_write(rt2x00dev, 167, 0x41);
-+	rt2800_bbp_glrt_write(rt2x00dev, 168, 0x36);
-+	rt2800_bbp_glrt_write(rt2x00dev, 169, 0x39);
-+	rt2800_bbp_glrt_write(rt2x00dev, 170, 0x30);
-+	rt2800_bbp_glrt_write(rt2x00dev, 171, 0x30);
-+	rt2800_bbp_glrt_write(rt2x00dev, 172, 0x0E);
-+	rt2800_bbp_glrt_write(rt2x00dev, 173, 0x0D);
-+	rt2800_bbp_glrt_write(rt2x00dev, 174, 0x28);
-+	rt2800_bbp_glrt_write(rt2x00dev, 175, 0x21);
-+	rt2800_bbp_glrt_write(rt2x00dev, 176, 0x1C);
-+	rt2800_bbp_glrt_write(rt2x00dev, 177, 0x16);
-+	rt2800_bbp_glrt_write(rt2x00dev, 178, 0x50);
-+	rt2800_bbp_glrt_write(rt2x00dev, 179, 0x4A);
-+	rt2800_bbp_glrt_write(rt2x00dev, 180, 0x43);
-+	rt2800_bbp_glrt_write(rt2x00dev, 181, 0x50);
-+	rt2800_bbp_glrt_write(rt2x00dev, 182, 0x10);
-+	rt2800_bbp_glrt_write(rt2x00dev, 183, 0x10);
-+	rt2800_bbp_glrt_write(rt2x00dev, 184, 0x10);
-+	rt2800_bbp_glrt_write(rt2x00dev, 185, 0x10);
-+	rt2800_bbp_glrt_write(rt2x00dev, 200, 0x7D);
-+	rt2800_bbp_glrt_write(rt2x00dev, 201, 0x14);
-+	rt2800_bbp_glrt_write(rt2x00dev, 202, 0x32);
-+	rt2800_bbp_glrt_write(rt2x00dev, 203, 0x2C);
-+	rt2800_bbp_glrt_write(rt2x00dev, 204, 0x36);
-+	rt2800_bbp_glrt_write(rt2x00dev, 205, 0x4C);
-+	rt2800_bbp_glrt_write(rt2x00dev, 206, 0x43);
-+	rt2800_bbp_glrt_write(rt2x00dev, 207, 0x2C);
-+	rt2800_bbp_glrt_write(rt2x00dev, 208, 0x2E);
-+	rt2800_bbp_glrt_write(rt2x00dev, 209, 0x36);
-+	rt2800_bbp_glrt_write(rt2x00dev, 210, 0x30);
-+	rt2800_bbp_glrt_write(rt2x00dev, 211, 0x6E);
-+
-+	/* BBP for G band DCOC function */
-+	rt2800_bbp_dcoc_write(rt2x00dev, 140, 0x0C);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 141, 0x00);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 142, 0x10);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 143, 0x10);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 144, 0x10);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 145, 0x10);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 146, 0x08);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 147, 0x40);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 148, 0x04);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 149, 0x04);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 150, 0x08);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 151, 0x08);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 152, 0x03);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 153, 0x03);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 154, 0x03);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 155, 0x02);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 156, 0x40);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 157, 0x40);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 158, 0x64);
-+	rt2800_bbp_dcoc_write(rt2x00dev, 159, 0x64);
-+
-+	rt2800_bbp4_mac_if_ctrl(rt2x00dev);
-+}
-+
- static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
- {
- 	unsigned int i;
-@@ -6194,7 +6834,10 @@ static void rt2800_init_bbp(struct rt2x0
- 		return;
- 	case RT5390:
- 	case RT5392:
--		rt2800_init_bbp_53xx(rt2x00dev);
-+		if (rt2x00dev->chip.rf == RF7620)
-+			rt2800_init_bbp_7620(rt2x00dev);
-+		else
-+			rt2800_init_bbp_53xx(rt2x00dev);
- 		break;
- 	case RT5592:
- 		rt2800_init_bbp_5592(rt2x00dev);
-@@ -7408,6 +8051,295 @@ static void rt2800_init_rfcsr_5592(struc
- 	rt2800_led_open_drain_enable(rt2x00dev);
- }
- 
-+static void rt2800_init_rfcsr_7620(struct rt2x00_dev *rt2x00dev)
-+{
-+	u16 freq;
-+	u8 rfvalue;
-+	/* Initialize RF central register to default value */
-+	rt2800_rfcsr_write(rt2x00dev, 0, 0x02);
-+	rt2800_rfcsr_write(rt2x00dev, 1, 0x03);
-+	rt2800_rfcsr_write(rt2x00dev, 2, 0x33);
-+	rt2800_rfcsr_write(rt2x00dev, 3, 0xFF);
-+	rt2800_rfcsr_write(rt2x00dev, 4, 0x0C);
-+	rt2800_rfcsr_write(rt2x00dev, 5, 0x40); /* Read only */
-+	rt2800_rfcsr_write(rt2x00dev, 6, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 7, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 8, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 9, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 10, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 11, 0x00);
-+	/* rt2800_rfcsr_write(rt2x00dev, 12, 0x43); *//* EEPROM */
-+	rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 14, 0x40);
-+	rt2800_rfcsr_write(rt2x00dev, 15, 0x22);
-+	rt2800_rfcsr_write(rt2x00dev, 16, 0x4C);
-+	rt2800_rfcsr_write(rt2x00dev, 17, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 18, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 19, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 20, 0xA0);
-+	rt2800_rfcsr_write(rt2x00dev, 21, 0x12);
-+	rt2800_rfcsr_write(rt2x00dev, 22, 0x07);
-+	rt2800_rfcsr_write(rt2x00dev, 23, 0x13);
-+	rt2800_rfcsr_write(rt2x00dev, 24, 0xFE);
-+	rt2800_rfcsr_write(rt2x00dev, 25, 0x24);
-+	rt2800_rfcsr_write(rt2x00dev, 26, 0x7A);
-+	rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 28, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 29, 0x05);
-+	rt2800_rfcsr_write(rt2x00dev, 30, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 31, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 32, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 33, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 34, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 35, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 36, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 37, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 38, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 39, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 40, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 41, 0xD0);
-+	rt2800_rfcsr_write(rt2x00dev, 42, 0x5B);
-+	rt2800_rfcsr_write(rt2x00dev, 43, 0x00);
-+
-+	struct hw_mode_spec *spec = &rt2x00dev->spec;
-+	rt2800_rfcsr_write(rt2x00dev, 11, 0x21);
-+	if (spec->clk_is_20mhz)
-+		rt2800_rfcsr_write(rt2x00dev, 13, 0x03);
-+	else
-+		rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 14, 0x7C);
-+	rt2800_rfcsr_write(rt2x00dev, 16, 0x80);
-+	rt2800_rfcsr_write(rt2x00dev, 17, 0x99);
-+	rt2800_rfcsr_write(rt2x00dev, 18, 0x99);
-+	rt2800_rfcsr_write(rt2x00dev, 19, 0x09);
-+	rt2800_rfcsr_write(rt2x00dev, 20, 0x50);
-+	rt2800_rfcsr_write(rt2x00dev, 21, 0xB0);
-+	rt2800_rfcsr_write(rt2x00dev, 22, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 23, 0x06);
-+	rt2800_rfcsr_write(rt2x00dev, 24, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 25, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 26, 0x5D);
-+	rt2800_rfcsr_write(rt2x00dev, 27, 0x00);
-+	rt2800_rfcsr_write(rt2x00dev, 28, 0x61);
-+	rt2800_rfcsr_write(rt2x00dev, 29, 0xB5);
-+	rt2800_rfcsr_write(rt2x00dev, 43, 0x02);
-+
-+	rt2800_rfcsr_write(rt2x00dev, 28, 0x62);
-+	rt2800_rfcsr_write(rt2x00dev, 29, 0xAD);
-+	rt2800_rfcsr_write(rt2x00dev, 39, 0x80);
-+	/* RTMP_TEMPERATURE_CALIBRATION */
-+	/* rt2800_rfcsr_write(rt2x00dev, 34, 0x23); */
-+	/* rt2800_rfcsr_write(rt2x00dev, 35, 0x01); */
-+
-+	/* use rt2800_adjust_freq_offset ? */
-+	rt2800_eeprom_read(rt2x00dev, EEPROM_FREQ, &freq);
-+	rfvalue = freq & 0xff;
-+	rt2800_rfcsr_write(rt2x00dev, 12, rfvalue);
-+
-+	/* Initialize RF channel register to default value */
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 0, 0x03);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 1, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 2, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 3, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 4, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 5, 0x08);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 6, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 7, 0x51);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 8, 0x53);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x16);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x61);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x53);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 12, 0x22);
-+	/* rt2800_rfcsr_write_chanreg(rt2x00dev, 13, 0x3D); */ /* fails */
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x06);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 15, 0x13);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 16, 0x22);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 17, 0x27);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 18, 0x02);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA7);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 20, 0x01);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 21, 0x52);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 22, 0x80);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 23, 0xB3);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 24, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 25, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 26, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 27, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x5C);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 29, 0x6B);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 30, 0x6B);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 31, 0x31);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 32, 0x5D);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 33, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 34, 0xE6);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 35, 0x55);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 36, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 37, 0xBB);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 38, 0xB3);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 39, 0xB3);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 40, 0x03);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 41, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 42, 0x00);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xB3);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xD3);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x07);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x68);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xEF);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x1C);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x07);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0xA8);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0x85);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x10);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x07);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6A);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0x85);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x10);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 62, 0x1C);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 63, 0x00);
-+
-+ 	rt2800_rfcsr_write_bank(rt2x00dev, 6, 45, 0xC5);
-+
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x47);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x71);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x33);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x0E);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 17, 0x23);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA4);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 20, 0x02);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 21, 0x12);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x1C);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 29, 0xEB);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 32, 0x7D);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 34, 0xD6);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 36, 0x08);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 38, 0xB4);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xB3);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xD5);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 46, 0x27);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x69);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFF);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x20);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xFF);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x1C);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x20);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xF7);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x09);
-+
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 10, 0x51);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x06);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 19, 0xA7);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 28, 0x2C);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x64);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 8, 0x51);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 9, 0x36);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 11, 0x53);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 14, 0x16);
-+
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x6C);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0xFC);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x1F);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 54, 0x27);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x66);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x6B);
-+
-+	/* Initialize RF channel register for DRQFN */
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0xD3);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0xE3);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0xE5);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x28);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x68);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0xF7);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x02);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0xC7);
-+
-+	/* reduce power consumption */
-+/*	rt2800_rfcsr_write_chanreg(rt2x00dev, 43, 0x53);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 44, 0x53);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 45, 0x53);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 47, 0x64);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 48, 0x4F);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 49, 0x02);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 55, 0x64);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 56, 0x4F);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 57, 0x02);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 58, 0x27);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 59, 0x64);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 60, 0x4F);
-+	rt2800_rfcsr_write_chanreg(rt2x00dev, 61, 0x02);
-+*/
-+	/* Initialize RF DC calibration register to default value */
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 0, 0x47);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 1, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 2, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 3, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 6, 0x10);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 7, 0x10);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 8, 0x04);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 9, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 10, 0x07);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 11, 0x01);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 12, 0x07);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 13, 0x07);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 14, 0x07);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 15, 0x20);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 16, 0x22);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 18, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 19, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 20, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 21, 0xF1);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 22, 0x11);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 23, 0x02);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 24, 0x41);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 25, 0x20);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 26, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 27, 0xD7);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 28, 0xA2);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 29, 0x20);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 30, 0x49);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 31, 0x20);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 32, 0x04);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 33, 0xF1);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 34, 0xA1);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 35, 0x01);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 41, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 42, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 43, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 44, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 45, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 46, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 47, 0x3E);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 48, 0x3D);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 49, 0x3E);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 50, 0x3D);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 51, 0x3E);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 52, 0x3D);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 53, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 54, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 55, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 56, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 57, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 58, 0x10);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 59, 0x10);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 60, 0x0A);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 61, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 62, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 63, 0x00);
-+
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 3, 0x08);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 4, 0x04);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x20);
-+
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 5, 0x00);
-+	rt2800_rfcsr_write_dccal(rt2x00dev, 17, 0x7C);
-+}
-+
- static void rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
- {
- 	if (rt2800_is_305x_soc(rt2x00dev)) {
-@@ -7443,7 +8375,10 @@ static void rt2800_init_rfcsr(struct rt2
- 		rt2800_init_rfcsr_5350(rt2x00dev);
- 		break;
- 	case RT5390:
--		rt2800_init_rfcsr_5390(rt2x00dev);
-+		if (rt2x00dev->chip.rf == RF7620)
-+			rt2800_init_rfcsr_7620(rt2x00dev);
-+		else
-+			rt2800_init_rfcsr_5390(rt2x00dev);
- 		break;
- 	case RT5392:
- 		rt2800_init_rfcsr_5392(rt2x00dev);
-@@ -7875,6 +8810,7 @@ static int rt2800_init_eeprom(struct rt2
- 	case RF5390:
- 	case RF5392:
- 	case RF5592:
-+	case RF7620:
- 		break;
- 	default:
- 		rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
-@@ -8441,6 +9377,7 @@ static int rt2800_probe_hw_mode(struct r
- 	case RF5372:
- 	case RF5390:
- 	case RF5392:
-+	case RF7620:
- 		spec->num_channels = 14;
- 		if (spec->clk_is_20mhz)
- 			spec->channels = rf_vals_xtal20mhz_3x;
-@@ -8581,6 +9518,7 @@ static int rt2800_probe_hw_mode(struct r
- 	case RF5372:
- 	case RF5390:
- 	case RF5392:
-+	case RF7620:
- 		__set_bit(CAPABILITY_VCO_RECALIBRATION, &rt2x00dev->cap_flags);
- 		break;
- 	}

package/kernel/mac80211/patches/920-ath10k_allow_fallback_to_board_bin_on_empty_otp_stream.patch

@@ -1,14 +0,0 @@
---- a/drivers/net/wireless/ath/ath10k/core.c
-+++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -280,7 +280,10 @@ static int ath10k_download_and_run_otp(s
- 
- 	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot otp execute result %d\n", result);
- 
--	if (result != 0) {
-+	if (result == 2) {
-+		ath10k_warn(ar, "otp stream is empty, using board.bin contents");
-+		return 0;
-+	} else if (result != 0) {
- 		ath10k_err(ar, "otp calibration failed: %d", result);
- 		return -EINVAL;
- 	}

package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch

@@ -1,33 +0,0 @@
-From: Sven Eckelmann <sven@open-mesh.com>
-Date: Tue, 18 Nov 2014 12:29:28 +0100
-Subject: [PATCH] ath10k: Don't initialize devices asynchronously
-
-libreCMC requires all PHYs to be initialized to create the configuration files
-during bootup. ath10k violates this because it delays the creation of the PHY
-to a not well defined point in the future.
-
-Forcing the work to be done immediately works around this problem but may also
-delay the boot when firmware images cannot be found.
-
-Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
----
-
---- a/drivers/net/wireless/ath/ath10k/core.c
-+++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -1119,6 +1119,16 @@ int ath10k_core_register(struct ath10k *
- 
- 	queue_work(ar->workqueue, &ar->register_work);
- 
-+	/* libreCMC requires all PHYs to be initialized to create the
-+	 * configuration files during bootup. ath10k violates this
-+	 * because it delays the creation of the PHY to a not well defined
-+	 * point in the future.
-+	 *
-+	 * Forcing the work to be done immediately works around this problem
-+	 * but may also delay the boot when firmware images cannot be found.
-+	 */
-+	flush_workqueue(ar->workqueue);
-+
- 	return 0;
- }
- EXPORT_SYMBOL(ath10k_core_register);