mac80211: rtl8xxxu: drop support patches

After a very enlightening but unfortunately far too short exchange with Jes we mutually agreed to drop the patches. They are unfortunately not ready yet. Acked-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: John Crispin <john@phrozen.org> (cherry picked from commit 66c5696cdf9599ccef652a651f52c0f7f53da44a)
author: John Crispin <john@phrozen.org> 2018-06-26 15:39:38 +0200
committer: John Crispin <john@phrozen.org> 2018-06-26 15:46:26 +0200
commit: cff16587bdcdb13bfa1fd076a77891091b08e387 (patch)
tree: e8fe1af59a7b758fc7965c21598a224f14dff432 /package
parent: 3f3a2c966a39c795e59f69d386607227c260c891 (diff)
download: upstream-cff16587bdcdb13bfa1fd076a77891091b08e387.tar.gz
upstream-cff16587bdcdb13bfa1fd076a77891091b08e387.tar.bz2
upstream-cff16587bdcdb13bfa1fd076a77891091b08e387.zip
58 files changed, 0 insertions, 3569 deletions
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index fffec0bbfe..5fd166e4c9 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -44,7 +44,6 @@ PKG_DRIVERS = \
 	rtl8180 rtl8187 \
 	rtlwifi rtlwifi-pci rtlwifi-btcoexist rtlwifi-usb rtl8192c-common \
 	rtl8192ce rtl8192se rtl8192de rtl8192cu rtl8821ae \
-	rtl8xxxu \
 	wlcore wl12xx wl18xx \
 	zd1211rw
 
@@ -1460,39 +1459,6 @@ define KernelPackage/rtl8821ae
   AUTOLOAD:=$(call AutoProbe,rtl8821ae)
 endef
 
-define KernelPackage/rtl8xxxu
-  $(call KernelPackage/mac80211/Default)
-  TITLE:=alternative Realtek RTL8XXXU support
-  DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-mac80211
-  FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.ko
-  AUTOLOAD:=$(call AutoProbe,rtl8xxxu)
-endef
-
-define KernelPackage/rtl8xxxu/description
-  This is an alternative driver for various Realtek RTL8XXX
-  parts written to utilize the Linux mac80211 stack.
-  The driver is known to work with a number of RTL8723AU,
-  RL8188CU, RTL8188RU, RTL8191CU, and RTL8192CU devices
-
-  This driver is under development and has a limited feature
-  set. In particular it does not yet support 40MHz channels
-  and power management. However it should have a smaller
-  memory footprint than the vendor drivers and benetifs
-  from the in kernel mac80211 stack.
-
-  It can coexist with drivers from drivers/staging/rtl8723au,
-  drivers/staging/rtl8192u, and drivers/net/wireless/rtlwifi,
-  but you will need to control which module you wish to load.
-
-  RTL8XXXU_UNTESTED is enabled
-  This option enables detection of Realtek 8723/8188/8191/8192 WiFi
-  USB devices which have not been tested directly by the driver
-  author or reported to be working by third parties.
-
-  Please report your results!
-endef
-
-
 define KernelPackage/wlcore
   $(call KernelPackage/mac80211/Default)
   TITLE:=TI common driver part
@@ -1741,9 +1707,6 @@ config-$(call config_package,rtl8192cu) += RTL8192CU
 config-$(call config_package,rtl8821ae) += RTL8821AE
 config-$(CONFIG_PACKAGE_RTLWIFI_DEBUG) += RTLWIFI_DEBUG
 
-config-$(call config_package,rtl8xxxu) += RTL8XXXU
-config-y += RTL8XXXU_UNTESTED
-
 config-$(CONFIG_LEDS_TRIGGERS) += MAC80211_LEDS B43_LEDS B43LEGACY_LEDS
 
 MAKE_OPTS:= -C "$(PKG_BUILD_DIR)" \
@@ -1954,7 +1917,6 @@ $(eval $(call KernelPackage,rtl8192se))
 $(eval $(call KernelPackage,rtl8192de))
 $(eval $(call KernelPackage,rtl8192cu))
 $(eval $(call KernelPackage,rtl8821ae))
-$(eval $(call KernelPackage,rtl8xxxu))
 $(eval $(call KernelPackage,wlcore))
 $(eval $(call KernelPackage,wl12xx))
 $(eval $(call KernelPackage,wl18xx))
diff --git a/package/kernel/mac80211/patches/653-0001-rtl8xxxu-Accept-firmware-signature-0x88e0.patch b/package/kernel/mac80211/patches/653-0001-rtl8xxxu-Accept-firmware-signature-0x88e0.patch
deleted file mode 100644
index c9b2e13a94..0000000000
--- a/package/kernel/mac80211/patches/653-0001-rtl8xxxu-Accept-firmware-signature-0x88e0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From f15fbdcb03abdf7403e8ebba52791cc596a8a8a6 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 27 Jun 2016 14:08:47 -0400
-Subject: [PATCH] rtl8xxxu: Accept firmware signature 0x88e0
-
-rtl8188eu uses firmware signature 0x88e0
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -2097,6 +2097,7 @@ int rtl8xxxu_load_firmware(struct rtl8xx
- 	switch (signature & 0xfff0) {
- 	case 0x92e0:
- 	case 0x92c0:
-+	case 0x88e0:
- 	case 0x88c0:
- 	case 0x5300:
- 	case 0x2300:
diff --git a/package/kernel/mac80211/patches/653-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch b/package/kernel/mac80211/patches/653-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch
deleted file mode 100644
index 71f93e9556..0000000000
--- a/package/kernel/mac80211/patches/653-0002-rtl8xxxu-Add-initial-code-to-detect-8188eu-devices.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 6f971392cd52524058f179d7c78464d692fbb018 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 27 Jun 2016 14:23:44 -0400
-Subject: [PATCH] rtl8xxxu: Add initial code to detect 8188eu devices
-
-So far this just detects the device and tries to load firmware.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/Makefile     |  2 +-
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   |  1 +
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 65 ++++++++++++++++++++++
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  |  3 +
- 4 files changed, 70 insertions(+), 1 deletion(-)
- create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/Makefile
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/Makefile
-@@ -1,4 +1,4 @@
- obj-$(CPTCFG_RTL8XXXU)	+= rtl8xxxu.o
- 
- rtl8xxxu-y	:= rtl8xxxu_core.o rtl8xxxu_8192e.o rtl8xxxu_8723b.o \
--		   rtl8xxxu_8723a.o rtl8xxxu_8192c.o
-+		   rtl8xxxu_8723a.o rtl8xxxu_8192c.o rtl8xxxu_8188e.o
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -1446,6 +1446,7 @@ void rtl8xxxu_fill_txdesc_v2(struct ieee
- 			     bool short_preamble, bool ampdu_enable,
- 			     u32 rts_rate);
- 
-+extern struct rtl8xxxu_fileops rtl8188eu_fops;
- extern struct rtl8xxxu_fileops rtl8192cu_fops;
- extern struct rtl8xxxu_fileops rtl8192eu_fops;
- extern struct rtl8xxxu_fileops rtl8723au_fops;
---- /dev/null
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -0,0 +1,65 @@
-+/*
-+ * RTL8XXXU mac80211 USB driver - 8188e specific subdriver
-+ *
-+ * Copyright (c) 2014 - 2016 Jes Sorensen <Jes.Sorensen@redhat.com>
-+ *
-+ * Portions, notably calibration code:
-+ * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved.
-+ *
-+ * This driver was written as a replacement for the vendor provided
-+ * rtl8723au driver. As the Realtek 8xxx chips are very similar in
-+ * their programming interface, I have started adding support for
-+ * additional 8xxx chips like the 8192cu, 8188cus, etc.
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of version 2 of the GNU General Public License as
-+ * published by the Free Software Foundation.
-+ *
-+ * 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.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/kernel.h>
-+#include <linux/sched.h>
-+#include <linux/errno.h>
-+#include <linux/slab.h>
-+#include <linux/module.h>
-+#include <linux/spinlock.h>
-+#include <linux/list.h>
-+#include <linux/usb.h>
-+#include <linux/netdevice.h>
-+#include <linux/etherdevice.h>
-+#include <linux/ethtool.h>
-+#include <linux/wireless.h>
-+#include <linux/firmware.h>
-+#include <linux/moduleparam.h>
-+#include <net/mac80211.h>
-+#include "rtl8xxxu.h"
-+#include "rtl8xxxu_regs.h"
-+
-+static int rtl8188eu_parse_efuse(struct rtl8xxxu_priv *priv)
-+{
-+	return 0;
-+}
-+
-+static int rtl8188eu_load_firmware(struct rtl8xxxu_priv *priv)
-+{
-+	char *fw_name;
-+	int ret;
-+
-+	fw_name = "rtlwifi/rtl8188eufw.bin";
-+
-+	ret = rtl8xxxu_load_firmware(priv, fw_name);
-+
-+	return -EINVAL;
-+	return ret;
-+}
-+
-+struct rtl8xxxu_fileops rtl8188eu_fops = {
-+	.parse_efuse = rtl8188eu_parse_efuse,
-+	.load_firmware = rtl8188eu_load_firmware,
-+	.reset_8051 = rtl8xxxu_reset_8051,
-+};
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -54,6 +54,7 @@ MODULE_LICENSE("GPL");
- MODULE_FIRMWARE("rtlwifi/rtl8723aufw_A.bin");
- MODULE_FIRMWARE("rtlwifi/rtl8723aufw_B.bin");
- MODULE_FIRMWARE("rtlwifi/rtl8723aufw_B_NoBT.bin");
-+MODULE_FIRMWARE("rtlwifi/rtl8188eufw.bin");
- MODULE_FIRMWARE("rtlwifi/rtl8192cufw_A.bin");
- MODULE_FIRMWARE("rtlwifi/rtl8192cufw_B.bin");
- MODULE_FIRMWARE("rtlwifi/rtl8192cufw_TMSC.bin");
-@@ -6212,6 +6213,8 @@ static const struct usb_device_id dev_ta
- {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0xb720, 0xff, 0xff, 0xff),
- 	.driver_info = (unsigned long)&rtl8723bu_fops},
- #ifdef CPTCFG_RTL8XXXU_UNTESTED
-+{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8179, 0xff, 0xff, 0xff),
-+	.driver_info = (unsigned long)&rtl8188eu_fops},
- /* Still supported by rtlwifi */
- {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8176, 0xff, 0xff, 0xff),
- 	.driver_info = (unsigned long)&rtl8192cu_fops},
diff --git a/package/kernel/mac80211/patches/653-0003-rtl8xxxu-Add-initial-code-to-parse-8188eu-efuse.patch b/package/kernel/mac80211/patches/653-0003-rtl8xxxu-Add-initial-code-to-parse-8188eu-efuse.patch
deleted file mode 100644
index 1905899e76..0000000000
--- a/package/kernel/mac80211/patches/653-0003-rtl8xxxu-Add-initial-code-to-parse-8188eu-efuse.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-From 6d5b4ef30046d74efe773613767d13d9ab95ed3d Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 27 Jun 2016 15:19:04 -0400
-Subject: [PATCH] rtl8xxxu: Add initial code to parse 8188eu efuse
-
-This obtains the MAC address, but work is still needed to handle TX
-power settings.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   | 40 ++++++++++++++++++++++
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 34 ++++++++++++++++++
- 2 files changed, 74 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -872,6 +872,45 @@ struct rtl8192eu_efuse {
- 	u8 res14[0xc3];
- };
- 
-+struct rtl8188eu_efuse {
-+	__le16 rtl_id;
-+	u8 res0[0x0e];
-+	u8 cck_tx_power_index_A[3];	/* 0x10 */
-+	u8 cck_tx_power_index_B[3];
-+	u8 ht40_1s_tx_power_index_A[3];	/* 0x16 */
-+	u8 ht40_1s_tx_power_index_B[3];
-+	u8 res1[0x9c];
-+	u8 channel_plan;		/* 0xb8 */
-+	u8 xtal_k;
-+	u8 thermal_meter;
-+	u8 iqk_lck;
-+	u8 res2[5];
-+	u8 rf_board_option;
-+	u8 rf_feature_option;
-+	u8 rf_bt_setting;
-+	u8 eeprom_version;
-+	u8 eeprom_customer_id;
-+	u8 res3[3];
-+	u8 rf_antenna_option;		/* 0xc9 */
-+	u8 res4[6];
-+	u8 vid;				/* 0xd0 */
-+	u8 res5[1];
-+	u8 pid;				/* 0xd2 */
-+	u8 res6[1];
-+	u8 usb_optional_function;
-+	u8 res7[2];
-+	u8 mac_addr[ETH_ALEN];		/* 0xd7 */
-+	u8 res8[2];
-+	u8 vendor_name[7];
-+	u8 res9[2];
-+	u8 device_name[0x0b];		/* 0xe8 */
-+	u8 res10[2];
-+	u8 serial[0x0b];		/* 0xf5 */
-+	u8 res11[0x30];
-+	u8 unknown[0x0d];		/* 0x130 */
-+	u8 res12[0xc3];
-+};
-+
- struct rtl8xxxu_reg8val {
- 	u16 reg;
- 	u8 val;
-@@ -1290,6 +1329,7 @@ struct rtl8xxxu_priv {
- 		struct rtl8723bu_efuse efuse8723bu;
- 		struct rtl8192cu_efuse efuse8192;
- 		struct rtl8192eu_efuse efuse8192eu;
-+		struct rtl8188eu_efuse efuse8188eu;
- 	} efuse_wifi;
- 	u32 adda_backup[RTL8XXXU_ADDA_REGS];
- 	u32 mac_backup[RTL8XXXU_MAC_REGS];
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -42,6 +42,40 @@
- 
- static int rtl8188eu_parse_efuse(struct rtl8xxxu_priv *priv)
- {
-+	struct rtl8188eu_efuse *efuse = &priv->efuse_wifi.efuse8188eu;
-+	int i;
-+
-+	if (efuse->rtl_id != cpu_to_le16(0x8129))
-+		return -EINVAL;
-+
-+	ether_addr_copy(priv->mac_addr, efuse->mac_addr);
-+
-+	memcpy(priv->cck_tx_power_index_A, efuse->cck_tx_power_index_A,
-+	       sizeof(efuse->cck_tx_power_index_A));
-+	memcpy(priv->cck_tx_power_index_B, efuse->cck_tx_power_index_B,
-+	       sizeof(efuse->cck_tx_power_index_B));
-+
-+	memcpy(priv->ht40_1s_tx_power_index_A,
-+	       priv->efuse_wifi.efuse8188eu.ht40_1s_tx_power_index_A,
-+	       sizeof(priv->ht40_1s_tx_power_index_A));
-+	memcpy(priv->ht40_1s_tx_power_index_B,
-+	       priv->efuse_wifi.efuse8188eu.ht40_1s_tx_power_index_B,
-+	       sizeof(priv->ht40_1s_tx_power_index_B));
-+
-+	dev_info(&priv->udev->dev, "Vendor: %.7s\n", efuse->vendor_name);
-+	dev_info(&priv->udev->dev, "Product: %.11s\n", efuse->device_name);
-+	dev_info(&priv->udev->dev, "Serial: %.11s\n", efuse->serial);
-+
-+	if (rtl8xxxu_debug & RTL8XXXU_DEBUG_EFUSE) {
-+		unsigned char *raw = priv->efuse_wifi.raw;
-+
-+		dev_info(&priv->udev->dev,
-+			 "%s: dumping efuse (0x%02zx bytes):\n",
-+			 __func__, sizeof(struct rtl8188eu_efuse));
-+		for (i = 0; i < sizeof(struct rtl8188eu_efuse); i += 8)
-+			dev_info(&priv->udev->dev, "%02x: %8ph\n", i, &raw[i]);
-+	}
-+
- 	return 0;
- }
- 
diff --git a/package/kernel/mac80211/patches/653-0004-rtl8xxxu-Detect-8188eu-parts-correctly.patch b/package/kernel/mac80211/patches/653-0004-rtl8xxxu-Detect-8188eu-parts-correctly.patch
deleted file mode 100644
index 83220e88f6..0000000000
--- a/package/kernel/mac80211/patches/653-0004-rtl8xxxu-Detect-8188eu-parts-correctly.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ac5a363d61caee80e7b4464e55ab012a4450ef5d Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 27 Jun 2016 15:34:00 -0400
-Subject: [PATCH] rtl8xxxu: Detect 8188eu parts correctly
-
-8188 parts with chip_cut >= 2 are assumed to be 8188eu.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 22 +++++++++++++++-------
- 1 file changed, 15 insertions(+), 7 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -1683,13 +1683,21 @@ static int rtl8xxxu_identify_chip(struct
- 		}
- 		priv->has_wifi = 1;
- 	} else {
--		sprintf(priv->chip_name, "8188CU");
--		priv->rf_paths = 1;
--		priv->rx_paths = 1;
--		priv->tx_paths = 1;
--		priv->rtl_chip = RTL8188C;
--		priv->usb_interrupts = 1;
--		priv->has_wifi = 1;
-+		if (priv->chip_cut >= 2) {
-+			sprintf(priv->chip_name, "8188EU");
-+			priv->rf_paths = 1;
-+			priv->rx_paths = 1;
-+			priv->tx_paths = 1;
-+			priv->rtl_chip = RTL8188E;
-+		} else {
-+			sprintf(priv->chip_name, "8188CU");
-+			priv->rf_paths = 1;
-+			priv->rx_paths = 1;
-+			priv->tx_paths = 1;
-+			priv->rtl_chip = RTL8188C;
-+			priv->usb_interrupts = 1;
-+			priv->has_wifi = 1;
-+		}
- 	}
- 
- 	switch (priv->rtl_chip) {
diff --git a/package/kernel/mac80211/patches/653-0005-rtl8xxxu-First-stab-at-rtl8188e_power_on.patch b/package/kernel/mac80211/patches/653-0005-rtl8xxxu-First-stab-at-rtl8188e_power_on.patch
deleted file mode 100644
index dbba85b4b9..0000000000
--- a/package/kernel/mac80211/patches/653-0005-rtl8xxxu-First-stab-at-rtl8188e_power_on.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From a7c3d46915bce6d84e61e684e76564b034bdc1a9 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 27 Jun 2016 17:08:30 -0400
-Subject: [PATCH] rtl8xxxu: First stab at rtl8188e_power_on()
-
-Code based on code from Andrea Merello.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 82 ++++++++++++++++++++++
- 1 file changed, 82 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -92,8 +92,90 @@ static int rtl8188eu_load_firmware(struc
- 	return ret;
- }
- 
-+static int rtl8188e_emu_to_active(struct rtl8xxxu_priv *priv)
-+{
-+	u8 val8;
-+	u32 val32;
-+	u16 val16;
-+	int count, ret = 0;
-+
-+	/* wait till 0x04[17] = 1 power ready*/
-+	for (count = RTL8XXXU_MAX_REG_POLL; count; count--) {
-+		val32 = rtl8xxxu_read32(priv, REG_APS_FSMCO);
-+		if (val32 & BIT(17))
-+			break;
-+
-+		udelay(10);
-+	}
-+
-+	if (!count) {
-+		ret = -EBUSY;
-+		goto exit;
-+	}
-+
-+	/* reset baseband */
-+	val8 = rtl8xxxu_read8(priv, REG_SYS_FUNC);
-+	val8 &= ~(SYS_FUNC_BBRSTB | SYS_FUNC_BB_GLB_RSTN);
-+	rtl8xxxu_write8(priv, REG_SYS_FUNC, val8);
-+
-+	/*0x24[23] = 2b'01 schmit trigger */
-+	val32 = rtl8xxxu_read32(priv, REG_AFE_XTAL_CTRL);
-+	val32 |= BIT(23);
-+	rtl8xxxu_write32(priv, REG_AFE_XTAL_CTRL, val32);
-+
-+	/* 0x04[15] = 0 disable HWPDN (control by DRV)*/
-+	val16 = rtl8xxxu_read16(priv, REG_APS_FSMCO);
-+	val16 &= ~APS_FSMCO_HW_POWERDOWN;
-+	rtl8xxxu_write16(priv, REG_APS_FSMCO, val16);
-+
-+	/*0x04[12:11] = 2b'00 disable WL suspend*/
-+	val16 = rtl8xxxu_read16(priv, REG_APS_FSMCO);
-+	val16 &= ~(APS_FSMCO_HW_SUSPEND | APS_FSMCO_PCIE);
-+	rtl8xxxu_write16(priv, REG_APS_FSMCO, val16);
-+
-+	/* set, then poll until 0 */
-+	val32 = rtl8xxxu_read32(priv, REG_APS_FSMCO);
-+	val32 |= APS_FSMCO_MAC_ENABLE;
-+	rtl8xxxu_write32(priv, REG_APS_FSMCO, val32);
-+
-+	for (count = RTL8XXXU_MAX_REG_POLL; count; count--) {
-+		val32 = rtl8xxxu_read32(priv, REG_APS_FSMCO);
-+		if ((val32 & APS_FSMCO_MAC_ENABLE) == 0) {
-+			ret = 0;
-+			break;
-+		}
-+		udelay(10);
-+	}
-+
-+	if (!count) {
-+		ret = -EBUSY;
-+		goto exit;
-+	}
-+
-+	/* LDO normal mode*/
-+	val8 = rtl8xxxu_read8(priv, REG_LPLDO_CTRL);
-+	val8 &= ~BIT(4);
-+	rtl8xxxu_write8(priv, REG_LPLDO_CTRL, val8);
-+
-+exit:
-+	return ret;
-+}
-+
-+static int rtl8188eu_power_on(struct rtl8xxxu_priv *priv)
-+{
-+	int ret;
-+
-+	ret = rtl8188e_emu_to_active(priv);
-+	if (ret)
-+		goto exit;
-+
-+exit:
-+	return ret;
-+}
-+
- struct rtl8xxxu_fileops rtl8188eu_fops = {
- 	.parse_efuse = rtl8188eu_parse_efuse,
- 	.load_firmware = rtl8188eu_load_firmware,
-+	.power_on = rtl8188eu_power_on,
- 	.reset_8051 = rtl8xxxu_reset_8051,
- };
diff --git a/package/kernel/mac80211/patches/653-0006-rtl8xxxu-Add-rtl8188e_disabled_to_emu.patch b/package/kernel/mac80211/patches/653-0006-rtl8xxxu-Add-rtl8188e_disabled_to_emu.patch
deleted file mode 100644
index 066f2fe241..0000000000
--- a/package/kernel/mac80211/patches/653-0006-rtl8xxxu-Add-rtl8188e_disabled_to_emu.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From b7335df2dc1b4c6c69ac6b95910d09a7dd5295a7 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 29 Jun 2016 10:38:52 -0400
-Subject: [PATCH] rtl8xxxu: Add rtl8188e_disabled_to_emu()
-
-This sequence is found in the vendor driver, but never actually
-called. It's unclear if we need it.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -92,6 +92,15 @@ static int rtl8188eu_load_firmware(struc
- 	return ret;
- }
- 
-+static void rtl8188e_disabled_to_emu(struct rtl8xxxu_priv *priv)
-+{
-+	u16 val16;
-+
-+	val16 = rtl8xxxu_read16(priv, REG_APS_FSMCO);
-+	val16 &= ~(APS_FSMCO_PFM_WOWL | APS_FSMCO_ENABLE_POWERDOWN);
-+	rtl8xxxu_write16(priv, REG_APS_FSMCO, val16);
-+}
-+
- static int rtl8188e_emu_to_active(struct rtl8xxxu_priv *priv)
- {
- 	u8 val8;
-@@ -165,6 +174,8 @@ static int rtl8188eu_power_on(struct rtl
- {
- 	int ret;
- 
-+	rtl8188e_disabled_to_emu(priv);
-+
- 	ret = rtl8188e_emu_to_active(priv);
- 	if (ret)
- 		goto exit;
diff --git a/package/kernel/mac80211/patches/653-0007-rtl8xxxu-8188e-Enable-scheduler.patch b/package/kernel/mac80211/patches/653-0007-rtl8xxxu-8188e-Enable-scheduler.patch
deleted file mode 100644
index 99f9152cac..0000000000
--- a/package/kernel/mac80211/patches/653-0007-rtl8xxxu-8188e-Enable-scheduler.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 682ffd261c494581b8fdbc81f42035a53c67f5c4 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 29 Jun 2016 11:07:13 -0400
-Subject: [PATCH] rtl8xxxu: 8188e: Enable scheduler
-
-This enables the schduler, DMA, etc, except for MAC RX/TX which has to
-be set after REG_TRXFF_BNDY due to a hardware bug in the 8188e
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -172,6 +172,7 @@ exit:
- 
- static int rtl8188eu_power_on(struct rtl8xxxu_priv *priv)
- {
-+	u16 val16;
- 	int ret;
- 
- 	rtl8188e_disabled_to_emu(priv);
-@@ -180,6 +181,21 @@ static int rtl8188eu_power_on(struct rtl
- 	if (ret)
- 		goto exit;
- 
-+	/*
-+	 * Enable MAC DMA/WMAC/SCHEDULE/SEC block
-+	 * Set CR bit10 to enable 32k calibration.
-+	 * We do not set CR_MAC_TX_ENABLE | CR_MAC_RX_ENABLE here
-+	 * due to a hardware bug in the 88E, requiring those to be
-+	 * set after REG_TRXFF_BNDY is set. If not the RXFF bundary
-+	 * will get set to a larger buffer size than the real buffer
-+	 * size.
-+	 */
-+	val16 = (CR_HCI_TXDMA_ENABLE | CR_HCI_RXDMA_ENABLE |
-+		 CR_TXDMA_ENABLE | CR_RXDMA_ENABLE |
-+		 CR_PROTOCOL_ENABLE | CR_SCHEDULE_ENABLE |
-+		 CR_SECURITY_ENABLE | CR_CALTIMER_ENABLE);
-+	rtl8xxxu_write16(priv, REG_CR, val16);
-+
- exit:
- 	return ret;
- }
diff --git a/package/kernel/mac80211/patches/653-0008-rtl8xxxu-Add-rtl8188e_usb_quirk-for-enabling-MAC-TX-.patch b/package/kernel/mac80211/patches/653-0008-rtl8xxxu-Add-rtl8188e_usb_quirk-for-enabling-MAC-TX-.patch
deleted file mode 100644
index fa62d6d9b1..0000000000
--- a/package/kernel/mac80211/patches/653-0008-rtl8xxxu-Add-rtl8188e_usb_quirk-for-enabling-MAC-TX-.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 58edb5e9811879e0a8e87f90057f12f615eab2d1 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 29 Jun 2016 11:47:10 -0400
-Subject: [PATCH] rtl8xxxu: Add rtl8188e_usb_quirk() for enabling MAC TX/RX
-
-Due to a bug in the 8188e chips, this has to be done after setting
-REG_TRXFF_BNDY.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -200,9 +200,24 @@ exit:
- 	return ret;
- }
- 
-+static void rtl8188e_usb_quirks(struct rtl8xxxu_priv *priv)
-+{
-+	u16 val16;
-+
-+	/*
-+	 * Technically this is not a USB quirk, but a chip quirk.
-+	 * This has to be done after REG_TRXFF_BNDY is set, see
-+	 * rtl8188eu_power_on() for details.
-+	 */
-+	val16 = rtl8xxxu_read16(priv, REG_CR);
-+	val16 |= (CR_MAC_TX_ENABLE | CR_MAC_RX_ENABLE);
-+	rtl8xxxu_write16(priv, REG_CR, val16);
-+}
-+
- struct rtl8xxxu_fileops rtl8188eu_fops = {
- 	.parse_efuse = rtl8188eu_parse_efuse,
- 	.load_firmware = rtl8188eu_load_firmware,
- 	.power_on = rtl8188eu_power_on,
- 	.reset_8051 = rtl8xxxu_reset_8051,
-+	.usb_quirks = rtl8188e_usb_quirks,
- };
diff --git a/package/kernel/mac80211/patches/653-0009-rtl8xxxu-8188e-add-REG_TXDMA_OFFSET_CHK-quirk.patch b/package/kernel/mac80211/patches/653-0009-rtl8xxxu-8188e-add-REG_TXDMA_OFFSET_CHK-quirk.patch
deleted file mode 100644
index 8a2821640c..0000000000
--- a/package/kernel/mac80211/patches/653-0009-rtl8xxxu-8188e-add-REG_TXDMA_OFFSET_CHK-quirk.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3ab047939db70fcae2a7c5993a8feaf3ac413e35 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 29 Jun 2016 11:53:31 -0400
-Subject: [PATCH] rtl8xxxu: 8188e add REG_TXDMA_OFFSET_CHK quirk
-
-Enable quirk allowing TX DMA to drop redundant data of packet. This is
-the same quirk enabled on gen2 parts.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -203,6 +203,7 @@ exit:
- static void rtl8188e_usb_quirks(struct rtl8xxxu_priv *priv)
- {
- 	u16 val16;
-+	u32 val32;
- 
- 	/*
- 	 * Technically this is not a USB quirk, but a chip quirk.
-@@ -212,6 +213,10 @@ static void rtl8188e_usb_quirks(struct r
- 	val16 = rtl8xxxu_read16(priv, REG_CR);
- 	val16 |= (CR_MAC_TX_ENABLE | CR_MAC_RX_ENABLE);
- 	rtl8xxxu_write16(priv, REG_CR, val16);
-+
-+	val32 = rtl8xxxu_read32(priv, REG_TXDMA_OFFSET_CHK);
-+	val32 |= TXDMA_OFFSET_DROP_DATA_EN;
-+	rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, val32);
- }
- 
- struct rtl8xxxu_fileops rtl8188eu_fops = {
diff --git a/package/kernel/mac80211/patches/653-0010-rtl8xxxu-Add-reserved-page-init-parameters-for-8188e.patch b/package/kernel/mac80211/patches/653-0010-rtl8xxxu-Add-reserved-page-init-parameters-for-8188e.patch
deleted file mode 100644
index 424b3b313a..0000000000
--- a/package/kernel/mac80211/patches/653-0010-rtl8xxxu-Add-reserved-page-init-parameters-for-8188e.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2bfba2657e3f99c6693ea30b60af4eb1d3e3950c Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 29 Jun 2016 12:02:18 -0400
-Subject: [PATCH] rtl8xxxu: Add reserved page init parameters for 8188e
-
-Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h       | 6 ++++++
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 4 ++++
- 2 files changed, 10 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -43,6 +43,7 @@
- #define REALTEK_USB_CMD_IDX		0x00
- 
- #define TX_TOTAL_PAGE_NUM		0xf8
-+#define TX_TOTAL_PAGE_NUM_8188E		0xa8
- #define TX_TOTAL_PAGE_NUM_8192E		0xf3
- #define TX_TOTAL_PAGE_NUM_8723B		0xf7
- /* (HPQ + LPQ + NPQ + PUBQ) = TX_TOTAL_PAGE_NUM */
-@@ -51,6 +52,11 @@
- #define TX_PAGE_NUM_LO_PQ		0x02
- #define TX_PAGE_NUM_NORM_PQ		0x02
- 
-+#define TX_PAGE_NUM_PUBQ_8188E		0x47
-+#define TX_PAGE_NUM_HI_PQ_8188E		0x29
-+#define TX_PAGE_NUM_LO_PQ_8188E		0x1c
-+#define TX_PAGE_NUM_NORM_PQ_8188E	0x1c
-+
- #define TX_PAGE_NUM_PUBQ_8192E		0xe7
- #define TX_PAGE_NUM_HI_PQ_8192E		0x08
- #define TX_PAGE_NUM_LO_PQ_8192E		0x0c
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -225,4 +225,8 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.power_on = rtl8188eu_power_on,
- 	.reset_8051 = rtl8xxxu_reset_8051,
- 	.usb_quirks = rtl8188e_usb_quirks,
-+	.total_page_num = TX_TOTAL_PAGE_NUM_8188E,
-+	.page_num_hi = TX_PAGE_NUM_HI_PQ_8188E,
-+	.page_num_lo = TX_PAGE_NUM_LO_PQ_8188E,
-+	.page_num_norm = TX_PAGE_NUM_NORM_PQ_8188E,
- };
diff --git a/package/kernel/mac80211/patches/653-0011-rtl8xxxu-Correct-TX_TOTAL_PAGE_NUM-for-8188eu.patch b/package/kernel/mac80211/patches/653-0011-rtl8xxxu-Correct-TX_TOTAL_PAGE_NUM-for-8188eu.patch
deleted file mode 100644
index 5318f32ae4..0000000000
--- a/package/kernel/mac80211/patches/653-0011-rtl8xxxu-Correct-TX_TOTAL_PAGE_NUM-for-8188eu.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ed4c1c87b4c2653f1528c886591bbddbb68216a1 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 8 Aug 2016 15:04:36 -0400
-Subject: [PATCH] rtl8xxxu: Correct TX_TOTAL_PAGE_NUM for 8188eu
-
-For some reason I had gotten this off-by-one when pulling them number
-from the vendor driver.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -43,7 +43,7 @@
- #define REALTEK_USB_CMD_IDX		0x00
- 
- #define TX_TOTAL_PAGE_NUM		0xf8
--#define TX_TOTAL_PAGE_NUM_8188E		0xa8
-+#define TX_TOTAL_PAGE_NUM_8188E		0xa9
- #define TX_TOTAL_PAGE_NUM_8192E		0xf3
- #define TX_TOTAL_PAGE_NUM_8723B		0xf7
- /* (HPQ + LPQ + NPQ + PUBQ) = TX_TOTAL_PAGE_NUM */
diff --git a/package/kernel/mac80211/patches/653-0012-rtl8xxxu-Add-trxff_boundary-for-8188e.patch b/package/kernel/mac80211/patches/653-0012-rtl8xxxu-Add-trxff_boundary-for-8188e.patch
deleted file mode 100644
index 828799ae4a..0000000000
--- a/package/kernel/mac80211/patches/653-0012-rtl8xxxu-Add-trxff_boundary-for-8188e.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bc55b854b404de79353547013a8f1ae31855f7c5 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 29 Jun 2016 12:08:31 -0400
-Subject: [PATCH] rtl8xxxu: Add trxff_boundary for 8188e
-
-The 8188e presumably has a 10K buffer, but leave space for TX report
-or WOL pattern.
-
-Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -225,6 +225,11 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.power_on = rtl8188eu_power_on,
- 	.reset_8051 = rtl8xxxu_reset_8051,
- 	.usb_quirks = rtl8188e_usb_quirks,
-+	/*
-+	 * Use 9K for 8188e normal chip
-+	 * Max RX buffer = 10K - max(TxReportSize(64*8), WOLPattern(16*24))
-+	 */
-+	.trxff_boundary = 0x23ff,
- 	.total_page_num = TX_TOTAL_PAGE_NUM_8188E,
- 	.page_num_hi = TX_PAGE_NUM_HI_PQ_8188E,
- 	.page_num_lo = TX_PAGE_NUM_LO_PQ_8188E,
diff --git a/package/kernel/mac80211/patches/653-0013-rtl8xxxu-8188eu-specify-firmware-block-size-and-set-.patch b/package/kernel/mac80211/patches/653-0013-rtl8xxxu-8188eu-specify-firmware-block-size-and-set-.patch
deleted file mode 100644
index 5076307a92..0000000000
--- a/package/kernel/mac80211/patches/653-0013-rtl8xxxu-8188eu-specify-firmware-block-size-and-set-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 29311af488cc1c1790a9b53c8073442548edd4bf Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 29 Jun 2016 15:03:54 -0400
-Subject: [PATCH] rtl8xxxu: 8188eu specify firmware block size and set
- power_off function
-
-This uses a conservative firmware block size for now.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -223,8 +223,10 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.parse_efuse = rtl8188eu_parse_efuse,
- 	.load_firmware = rtl8188eu_load_firmware,
- 	.power_on = rtl8188eu_power_on,
-+	.power_off = rtl8xxxu_power_off,
- 	.reset_8051 = rtl8xxxu_reset_8051,
- 	.usb_quirks = rtl8188e_usb_quirks,
-+	.writeN_block_size = 128,
- 	/*
- 	 * Use 9K for 8188e normal chip
- 	 * Max RX buffer = 10K - max(TxReportSize(64*8), WOLPattern(16*24))
diff --git a/package/kernel/mac80211/patches/653-0014-rtl8xxxu-Add-8188e-mac-init-table.patch b/package/kernel/mac80211/patches/653-0014-rtl8xxxu-Add-8188e-mac-init-table.patch
deleted file mode 100644
index 5360f5928f..0000000000
--- a/package/kernel/mac80211/patches/653-0014-rtl8xxxu-Add-8188e-mac-init-table.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 96cb7475c4c5750e8dac3dc85638f8438b9bce4e Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 19 Jul 2016 15:04:24 -0400
-Subject: [PATCH] rtl8xxxu: Add 8188e mac init table
-
-This table was pulled from the vendor driver.
-
-Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 28 ++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -40,6 +40,33 @@
- #include "rtl8xxxu.h"
- #include "rtl8xxxu_regs.h"
- 
-+static struct rtl8xxxu_reg8val rtl8188e_mac_init_table[] = {
-+	{0x026, 0x41}, {0x027, 0x35}, {0x428, 0x0a}, {0x429, 0x10},
-+	{0x430, 0x00}, {0x431, 0x01}, {0x432, 0x02}, {0x433, 0x04},
-+	{0x434, 0x05}, {0x435, 0x06}, {0x436, 0x07}, {0x437, 0x08},
-+	{0x438, 0x00}, {0x439, 0x00}, {0x43a, 0x01}, {0x43b, 0x02},
-+	{0x43c, 0x04}, {0x43d, 0x05}, {0x43e, 0x06}, {0x43f, 0x07},
-+	{0x440, 0x5d}, {0x441, 0x01}, {0x442, 0x00}, {0x444, 0x15},
-+	{0x445, 0xf0}, {0x446, 0x0f}, {0x447, 0x00}, {0x458, 0x41},
-+	{0x459, 0xa8}, {0x45a, 0x72}, {0x45b, 0xb9}, {0x460, 0x66},
-+	{0x461, 0x66}, {0x480, 0x08}, {0x4c8, 0xff}, {0x4c9, 0x08},
-+	{0x4cc, 0xff}, {0x4cd, 0xff}, {0x4ce, 0x01}, {0x4d3, 0x01},
-+	{0x500, 0x26}, {0x501, 0xa2}, {0x502, 0x2f}, {0x503, 0x00},
-+	{0x504, 0x28}, {0x505, 0xa3}, {0x506, 0x5e}, {0x507, 0x00},
-+	{0x508, 0x2b}, {0x509, 0xa4}, {0x50a, 0x5e}, {0x50b, 0x00},
-+	{0x50c, 0x4f}, {0x50d, 0xa4}, {0x50e, 0x00}, {0x50f, 0x00},
-+	{0x512, 0x1c}, {0x514, 0x0a}, {0x516, 0x0a}, {0x525, 0x4f},
-+	{0x550, 0x10}, {0x551, 0x10}, {0x559, 0x02}, {0x55d, 0xff},
-+	{0x605, 0x30}, {0x608, 0x0e}, {0x609, 0x2a}, {0x620, 0xff},
-+	{0x621, 0xff}, {0x622, 0xff}, {0x623, 0xff}, {0x624, 0xff},
-+	{0x625, 0xff}, {0x626, 0xff}, {0x627, 0xff}, {0x652, 0x20},
-+	{0x63c, 0x0a}, {0x63d, 0x0a}, {0x63e, 0x0e}, {0x63f, 0x0e},
-+	{0x640, 0x40}, {0x66e, 0x05}, {0x700, 0x21}, {0x701, 0x43},
-+	{0x702, 0x65}, {0x703, 0x87}, {0x708, 0x21}, {0x709, 0x43},
-+	{0x70a, 0x65}, {0x70b, 0x87},
-+	{0xffff, 0xff},
-+};
-+
- static int rtl8188eu_parse_efuse(struct rtl8xxxu_priv *priv)
- {
- 	struct rtl8188eu_efuse *efuse = &priv->efuse_wifi.efuse8188eu;
-@@ -232,6 +259,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	 * Max RX buffer = 10K - max(TxReportSize(64*8), WOLPattern(16*24))
- 	 */
- 	.trxff_boundary = 0x23ff,
-+	.mactable = rtl8188e_mac_init_table,
- 	.total_page_num = TX_TOTAL_PAGE_NUM_8188E,
- 	.page_num_hi = TX_PAGE_NUM_HI_PQ_8188E,
- 	.page_num_lo = TX_PAGE_NUM_LO_PQ_8188E,
diff --git a/package/kernel/mac80211/patches/653-0015-rtl8xxxu-Implement-rtl8188eu_init_phy_bb.patch b/package/kernel/mac80211/patches/653-0015-rtl8xxxu-Implement-rtl8188eu_init_phy_bb.patch
deleted file mode 100644
index e7c5b7b651..0000000000
--- a/package/kernel/mac80211/patches/653-0015-rtl8xxxu-Implement-rtl8188eu_init_phy_bb.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-From b6770f88fd208978bd84e7217fee9fedd9b3fa9f Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 19 Jul 2016 16:19:30 -0400
-Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_init_phy_bb()
-
-This includes adding rtl8188eu_phy_init_table rtl8188e_agc_table, both
-extracted from the vendor driver.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 202 +++++++++++++++++++++
- 1 file changed, 202 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -67,6 +67,174 @@ static struct rtl8xxxu_reg8val rtl8188e_
- 	{0xffff, 0xff},
- };
- 
-+static struct rtl8xxxu_reg32val rtl8188eu_phy_init_table[] = {
-+	{0x800, 0x80040000}, {0x804, 0x00000003},
-+	{0x808, 0x0000fc00}, {0x80c, 0x0000000a},
-+	{0x810, 0x10001331}, {0x814, 0x020c3d10},
-+	{0x818, 0x02200385}, {0x81c, 0x00000000},
-+	{0x820, 0x01000100}, {0x824, 0x00390204},
-+	{0x828, 0x00000000}, {0x82c, 0x00000000},
-+	{0x830, 0x00000000}, {0x834, 0x00000000},
-+	{0x838, 0x00000000}, {0x83c, 0x00000000},
-+	{0x840, 0x00010000}, {0x844, 0x00000000},
-+	{0x848, 0x00000000}, {0x84c, 0x00000000},
-+	{0x850, 0x00000000}, {0x854, 0x00000000},
-+	{0x858, 0x569a11a9}, {0x85c, 0x01000014},
-+	{0x860, 0x66f60110}, {0x864, 0x061f0649},
-+	{0x868, 0x00000000}, {0x86c, 0x27272700},
-+	{0x870, 0x07000760}, {0x874, 0x25004000},
-+	{0x878, 0x00000808}, {0x87c, 0x00000000},
-+	{0x880, 0xb0000c1c}, {0x884, 0x00000001},
-+	{0x888, 0x00000000}, {0x88c, 0xccc000c0},
-+	{0x890, 0x00000800}, {0x894, 0xfffffffe},
-+	{0x898, 0x40302010}, {0x89c, 0x00706050},
-+	{0x900, 0x00000000}, {0x904, 0x00000023},
-+	{0x908, 0x00000000}, {0x90c, 0x81121111},
-+	{0x910, 0x00000002}, {0x914, 0x00000201},
-+	{0xa00, 0x00d047c8}, {0xa04, 0x80ff000c},
-+	{0xa08, 0x8c838300}, {0xa0c, 0x2e7f120f},
-+	{0xa10, 0x9500bb78}, {0xa14, 0x1114d028},
-+	{0xa18, 0x00881117}, {0xa1c, 0x89140f00},
-+	{0xa20, 0x1a1b0000}, {0xa24, 0x090e1317},
-+	{0xa28, 0x00000204}, {0xa2c, 0x00d30000},
-+	{0xa70, 0x101fbf00}, {0xa74, 0x00000007},
-+	{0xa78, 0x00000900}, {0xa7c, 0x225b0606},
-+	{0xa80, 0x218075b1}, {0xb2c, 0x80000000},
-+	{0xc00, 0x48071d40}, {0xc04, 0x03a05611},
-+	{0xc08, 0x000000e4}, {0xc0c, 0x6c6c6c6c},
-+	{0xc10, 0x08800000}, {0xc14, 0x40000100},
-+	{0xc18, 0x08800000}, {0xc1c, 0x40000100},
-+	{0xc20, 0x00000000}, {0xc24, 0x00000000},
-+	{0xc28, 0x00000000}, {0xc2c, 0x00000000},
-+	{0xc30, 0x69e9ac47}, {0xc34, 0x469652af},
-+	{0xc38, 0x49795994}, {0xc3c, 0x0a97971c},
-+	{0xc40, 0x1f7c403f}, {0xc44, 0x000100b7},
-+	{0xc48, 0xec020107}, {0xc4c, 0x007f037f},
-+	{0xc50, 0x69553420}, {0xc54, 0x43bc0094},
-+	{0xc58, 0x00013169}, {0xc5c, 0x00250492},
-+	{0xc60, 0x00000000}, {0xc64, 0x7112848b},
-+	{0xc68, 0x47c00bff}, {0xc6c, 0x00000036},
-+	{0xc70, 0x2c7f000d}, {0xc74, 0x020610db},
-+	{0xc78, 0x0000001f}, {0xc7c, 0x00b91612},
-+	{0xc80, 0x390000e4}, {0xc84, 0x20f60000},
-+	{0xc88, 0x40000100}, {0xc8c, 0x20200000},
-+	{0xc90, 0x00091521}, {0xc94, 0x00000000},
-+	{0xc98, 0x00121820}, {0xc9c, 0x00007f7f},
-+	{0xca0, 0x00000000}, {0xca4, 0x000300a0},
-+	{0xca8, 0x00000000}, {0xcac, 0x00000000},
-+	{0xcb0, 0x00000000}, {0xcb4, 0x00000000},
-+	{0xcb8, 0x00000000}, {0xcbc, 0x28000000},
-+	{0xcc0, 0x00000000}, {0xcc4, 0x00000000},
-+	{0xcc8, 0x00000000}, {0xccc, 0x00000000},
-+	{0xcd0, 0x00000000}, {0xcd4, 0x00000000},
-+	{0xcd8, 0x64b22427}, {0xcdc, 0x00766932},
-+	{0xce0, 0x00222222}, {0xce4, 0x00000000},
-+	{0xce8, 0x37644302}, {0xcec, 0x2f97d40c},
-+	{0xd00, 0x00000740}, {0xd04, 0x00020401},
-+	{0xd08, 0x0000907f}, {0xd0c, 0x20010201},
-+	{0xd10, 0xa0633333}, {0xd14, 0x3333bc43},
-+	{0xd18, 0x7a8f5b6f}, {0xd2c, 0xcc979975},
-+	{0xd30, 0x00000000}, {0xd34, 0x80608000},
-+	{0xd38, 0x00000000}, {0xd3c, 0x00127353},
-+	{0xd40, 0x00000000}, {0xd44, 0x00000000},
-+	{0xd48, 0x00000000}, {0xd4c, 0x00000000},
-+	{0xd50, 0x6437140a}, {0xd54, 0x00000000},
-+	{0xd58, 0x00000282}, {0xd5c, 0x30032064},
-+	{0xd60, 0x4653de68}, {0xd64, 0x04518a3c},
-+	{0xd68, 0x00002101}, {0xd6c, 0x2a201c16},
-+	{0xd70, 0x1812362e}, {0xd74, 0x322c2220},
-+	{0xd78, 0x000e3c24}, {0xe00, 0x2d2d2d2d},
-+	{0xe04, 0x2d2d2d2d}, {0xe08, 0x0390272d},
-+	{0xe10, 0x2d2d2d2d}, {0xe14, 0x2d2d2d2d},
-+	{0xe18, 0x2d2d2d2d}, {0xe1c, 0x2d2d2d2d},
-+	{0xe28, 0x00000000}, {0xe30, 0x1000dc1f},
-+	{0xe34, 0x10008c1f}, {0xe38, 0x02140102},
-+	{0xe3c, 0x681604c2}, {0xe40, 0x01007c00},
-+	{0xe44, 0x01004800}, {0xe48, 0xfb000000},
-+	{0xe4c, 0x000028d1}, {0xe50, 0x1000dc1f},
-+	{0xe54, 0x10008c1f}, {0xe58, 0x02140102},
-+	{0xe5c, 0x28160d05}, {0xe60, 0x00000008},
-+	{0xe68, 0x001b25a4}, {0xe6c, 0x00c00014},
-+	{0xe70, 0x00c00014}, {0xe74, 0x01000014},
-+	{0xe78, 0x01000014}, {0xe7c, 0x01000014},
-+	{0xe80, 0x01000014}, {0xe84, 0x00c00014},
-+	{0xe88, 0x01000014}, {0xe8c, 0x00c00014},
-+	{0xed0, 0x00c00014}, {0xed4, 0x00c00014},
-+	{0xed8, 0x00c00014}, {0xedc, 0x00000014},
-+	{0xee0, 0x00000014}, {0xeec, 0x01c00014},
-+	{0xf14, 0x00000003}, {0xf4c, 0x00000000},
-+	{0xf00, 0x00000300},
-+	{0xffff, 0xffffffff},
-+};
-+
-+static struct rtl8xxxu_reg32val rtl8188e_agc_table[] = {
-+	{0xc78, 0xfb000001}, {0xc78, 0xfb010001},
-+	{0xc78, 0xfb020001}, {0xc78, 0xfb030001},
-+	{0xc78, 0xfb040001}, {0xc78, 0xfb050001},
-+	{0xc78, 0xfa060001}, {0xc78, 0xf9070001},
-+	{0xc78, 0xf8080001}, {0xc78, 0xf7090001},
-+	{0xc78, 0xf60a0001}, {0xc78, 0xf50b0001},
-+	{0xc78, 0xf40c0001}, {0xc78, 0xf30d0001},
-+	{0xc78, 0xf20e0001}, {0xc78, 0xf10f0001},
-+	{0xc78, 0xf0100001}, {0xc78, 0xef110001},
-+	{0xc78, 0xee120001}, {0xc78, 0xed130001},
-+	{0xc78, 0xec140001}, {0xc78, 0xeb150001},
-+	{0xc78, 0xea160001}, {0xc78, 0xe9170001},
-+	{0xc78, 0xe8180001}, {0xc78, 0xe7190001},
-+	{0xc78, 0xe61a0001}, {0xc78, 0xe51b0001},
-+	{0xc78, 0xe41c0001}, {0xc78, 0xe31d0001},
-+	{0xc78, 0xe21e0001}, {0xc78, 0xe11f0001},
-+	{0xc78, 0x8a200001}, {0xc78, 0x89210001},
-+	{0xc78, 0x88220001}, {0xc78, 0x87230001},
-+	{0xc78, 0x86240001}, {0xc78, 0x85250001},
-+	{0xc78, 0x84260001}, {0xc78, 0x83270001},
-+	{0xc78, 0x82280001}, {0xc78, 0x6b290001},
-+	{0xc78, 0x6a2a0001}, {0xc78, 0x692b0001},
-+	{0xc78, 0x682c0001}, {0xc78, 0x672d0001},
-+	{0xc78, 0x662e0001}, {0xc78, 0x652f0001},
-+	{0xc78, 0x64300001}, {0xc78, 0x63310001},
-+	{0xc78, 0x62320001}, {0xc78, 0x61330001},
-+	{0xc78, 0x46340001}, {0xc78, 0x45350001},
-+	{0xc78, 0x44360001}, {0xc78, 0x43370001},
-+	{0xc78, 0x42380001}, {0xc78, 0x41390001},
-+	{0xc78, 0x403a0001}, {0xc78, 0x403b0001},
-+	{0xc78, 0x403c0001}, {0xc78, 0x403d0001},
-+	{0xc78, 0x403e0001}, {0xc78, 0x403f0001},
-+	{0xc78, 0xfb400001}, {0xc78, 0xfb410001},
-+	{0xc78, 0xfb420001}, {0xc78, 0xfb430001},
-+	{0xc78, 0xfb440001}, {0xc78, 0xfb450001},
-+	{0xc78, 0xfb460001}, {0xc78, 0xfb470001},
-+	{0xc78, 0xfb480001}, {0xc78, 0xfa490001},
-+	{0xc78, 0xf94a0001}, {0xc78, 0xf84b0001},
-+	{0xc78, 0xf74c0001}, {0xc78, 0xf64d0001},
-+	{0xc78, 0xf54e0001}, {0xc78, 0xf44f0001},
-+	{0xc78, 0xf3500001}, {0xc78, 0xf2510001},
-+	{0xc78, 0xf1520001}, {0xc78, 0xf0530001},
-+	{0xc78, 0xef540001}, {0xc78, 0xee550001},
-+	{0xc78, 0xed560001}, {0xc78, 0xec570001},
-+	{0xc78, 0xeb580001}, {0xc78, 0xea590001},
-+	{0xc78, 0xe95a0001}, {0xc78, 0xe85b0001},
-+	{0xc78, 0xe75c0001}, {0xc78, 0xe65d0001},
-+	{0xc78, 0xe55e0001}, {0xc78, 0xe45f0001},
-+	{0xc78, 0xe3600001}, {0xc78, 0xe2610001},
-+	{0xc78, 0xc3620001}, {0xc78, 0xc2630001},
-+	{0xc78, 0xc1640001}, {0xc78, 0x8b650001},
-+	{0xc78, 0x8a660001}, {0xc78, 0x89670001},
-+	{0xc78, 0x88680001}, {0xc78, 0x87690001},
-+	{0xc78, 0x866a0001}, {0xc78, 0x856b0001},
-+	{0xc78, 0x846c0001}, {0xc78, 0x676d0001},
-+	{0xc78, 0x666e0001}, {0xc78, 0x656f0001},
-+	{0xc78, 0x64700001}, {0xc78, 0x63710001},
-+	{0xc78, 0x62720001}, {0xc78, 0x61730001},
-+	{0xc78, 0x60740001}, {0xc78, 0x46750001},
-+	{0xc78, 0x45760001}, {0xc78, 0x44770001},
-+	{0xc78, 0x43780001}, {0xc78, 0x42790001},
-+	{0xc78, 0x417a0001}, {0xc78, 0x407b0001},
-+	{0xc78, 0x407c0001}, {0xc78, 0x407d0001},
-+	{0xc78, 0x407e0001}, {0xc78, 0x407f0001},
-+	{0xffff, 0xffffffff}
-+};
-+
- static int rtl8188eu_parse_efuse(struct rtl8xxxu_priv *priv)
- {
- 	struct rtl8188eu_efuse *efuse = &priv->efuse_wifi.efuse8188eu;
-@@ -89,6 +257,8 @@ static int rtl8188eu_parse_efuse(struct
- 	       priv->efuse_wifi.efuse8188eu.ht40_1s_tx_power_index_B,
- 	       sizeof(priv->ht40_1s_tx_power_index_B));
- 
-+	priv->xtalk = priv->efuse_wifi.efuse8188eu.xtal_k & 0x3f;
-+
- 	dev_info(&priv->udev->dev, "Vendor: %.7s\n", efuse->vendor_name);
- 	dev_info(&priv->udev->dev, "Product: %.11s\n", efuse->device_name);
- 	dev_info(&priv->udev->dev, "Serial: %.11s\n", efuse->serial);
-@@ -119,6 +289,37 @@ static int rtl8188eu_load_firmware(struc
- 	return ret;
- }
- 
-+static void rtl8188eu_init_phy_bb(struct rtl8xxxu_priv *priv)
-+{
-+	u8 val8;
-+	u16 val16;
-+	u32 val32;
-+
-+	val16 = rtl8xxxu_read16(priv, REG_SYS_FUNC);
-+	val16 |= SYS_FUNC_BB_GLB_RSTN | SYS_FUNC_BBRSTB | SYS_FUNC_DIO_RF;
-+	rtl8xxxu_write16(priv, REG_SYS_FUNC, val16);
-+
-+	/*
-+	 * Per vendor driver, run power sequence before init of RF
-+	 */
-+	val8 = RF_ENABLE | RF_RSTB | RF_SDMRSTB;
-+	rtl8xxxu_write8(priv, REG_RF_CTRL, val8);
-+
-+	val16 = rtl8xxxu_read16(priv, REG_SYS_FUNC);
-+	val16 |= (SYS_FUNC_USBA | SYS_FUNC_USBD |
-+		  SYS_FUNC_BB_GLB_RSTN | SYS_FUNC_BBRSTB);
-+	rtl8xxxu_write16(priv, REG_SYS_FUNC, val16);
-+
-+	rtl8xxxu_init_phy_regs(priv, rtl8188eu_phy_init_table);
-+	rtl8xxxu_init_phy_regs(priv, rtl8188e_agc_table);
-+
-+	val32 = rtl8xxxu_read32(priv, REG_AFE_XTAL_CTRL);
-+	val8 = priv->xtalk;
-+	val32 &= 0xff8007ff;
-+	val32 |= ((val8 | (val8 << 6)) << 11);
-+	rtl8xxxu_write32(priv, REG_AFE_XTAL_CTRL, val32);
-+}
-+
- static void rtl8188e_disabled_to_emu(struct rtl8xxxu_priv *priv)
- {
- 	u16 val16;
-@@ -252,6 +453,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.power_on = rtl8188eu_power_on,
- 	.power_off = rtl8xxxu_power_off,
- 	.reset_8051 = rtl8xxxu_reset_8051,
-+	.init_phy_bb = rtl8188eu_init_phy_bb,
- 	.usb_quirks = rtl8188e_usb_quirks,
- 	.writeN_block_size = 128,
- 	/*
diff --git a/package/kernel/mac80211/patches/653-0016-rtl8xxxu-Implement-rtl8188eu_init_phy_rf.patch b/package/kernel/mac80211/patches/653-0016-rtl8xxxu-Implement-rtl8188eu_init_phy_rf.patch
deleted file mode 100644
index 89e481cdcd..0000000000
--- a/package/kernel/mac80211/patches/653-0016-rtl8xxxu-Implement-rtl8188eu_init_phy_rf.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 0c6fa292a9c6d7f1b870c42ed9166674463206f1 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 19 Jul 2016 17:12:42 -0400
-Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_init_phy_rf()
-
-Include the table rtl8188eu_radioa_init_table derived from vendor
-driver. The vendor table relies on a hack setting RF6052_REG_RCK1 +
-RF6052_REG_RCK2 with delays. This workaround is open coded here
-instead of modifying the table parsing code.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 65 ++++++++++++++++++++++
- 1 file changed, 65 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -235,6 +235,54 @@ static struct rtl8xxxu_reg32val rtl8188e
- 	{0xffff, 0xffffffff}
- };
- 
-+static struct rtl8xxxu_rfregval rtl8188eu_radioa_init_table[] = {
-+	{0x00, 0x00030000}, {0x08, 0x00084000},
-+	{0x18, 0x00000407}, {0x19, 0x00000012},
-+	{0x1e, 0x00080009}, {0x1f, 0x00000880},
-+	{0x2f, 0x0001a060}, {0x3f, 0x00000000},
-+	{0x42, 0x000060c0}, {0x57, 0x000d0000},
-+	{0x58, 0x000be180}, {0x67, 0x00001552},
-+	{0x83, 0x00000000}, {0xb0, 0x000ff8fc},
-+	{0xb1, 0x00054400}, {0xb2, 0x000ccc19},
-+	{0xb4, 0x00043003}, {0xb6, 0x0004953e},
-+	{0xb7, 0x0001c718}, {0xb8, 0x000060ff},
-+	{0xb9, 0x00080001}, {0xba, 0x00040000},
-+	{0xbb, 0x00000400}, {0xbf, 0x000c0000},
-+	{0xc2, 0x00002400}, {0xc3, 0x00000009},
-+	{0xc4, 0x00040c91}, {0xc5, 0x00099999},
-+	{0xc6, 0x000000a3}, {0xc7, 0x00088820},
-+	{0xc8, 0x00076c06}, {0xc9, 0x00000000},
-+	{0xca, 0x00080000}, {0xdf, 0x00000180},
-+	{0xef, 0x000001a0}, {0x51, 0x0006b27d},
-+	{0x52, 0x0007e49d},	/* Set to 0x0007e4dd for SDIO */
-+	{0x53, 0x00000073}, {0x56, 0x00051ff3},
-+	{0x35, 0x00000086}, {0x35, 0x00000186},
-+	{0x35, 0x00000286}, {0x36, 0x00001c25},
-+	{0x36, 0x00009c25}, {0x36, 0x00011c25},
-+	{0x36, 0x00019c25}, {0xb6, 0x00048538},
-+	{0x18, 0x00000c07}, {0x5a, 0x0004bd00},
-+	{0x19, 0x000739d0}, {0x34, 0x0000adf3},
-+	{0x34, 0x00009df0}, {0x34, 0x00008ded},
-+	{0x34, 0x00007dea}, {0x34, 0x00006de7},
-+	{0x34, 0x000054ee}, {0x34, 0x000044eb},
-+	{0x34, 0x000034e8}, {0x34, 0x0000246b},
-+	{0x34, 0x00001468}, {0x34, 0x0000006d},
-+	{0x00, 0x00030159}, {0x84, 0x00068200},
-+	{0x86, 0x000000ce}, {0x87, 0x00048a00},
-+	{0x8e, 0x00065540}, {0x8f, 0x00088000},
-+	{0xef, 0x000020a0}, {0x3b, 0x000f02b0},
-+	{0x3b, 0x000ef7b0}, {0x3b, 0x000d4fb0},
-+	{0x3b, 0x000cf060}, {0x3b, 0x000b0090},
-+	{0x3b, 0x000a0080}, {0x3b, 0x00090080},
-+	{0x3b, 0x0008f780}, {0x3b, 0x000722b0},
-+	{0x3b, 0x0006f7b0}, {0x3b, 0x00054fb0},
-+	{0x3b, 0x0004f060}, {0x3b, 0x00030090},
-+	{0x3b, 0x00020080}, {0x3b, 0x00010080},
-+	{0x3b, 0x0000f780}, {0xef, 0x000000a0},
-+	{0x00, 0x00010159}, {0x18, 0x0000f407},
-+	{0xff, 0xffffffff}
-+};
-+
- static int rtl8188eu_parse_efuse(struct rtl8xxxu_priv *priv)
- {
- 	struct rtl8188eu_efuse *efuse = &priv->efuse_wifi.efuse8188eu;
-@@ -320,6 +368,22 @@ static void rtl8188eu_init_phy_bb(struct
- 	rtl8xxxu_write32(priv, REG_AFE_XTAL_CTRL, val32);
- }
- 
-+static int rtl8188eu_init_phy_rf(struct rtl8xxxu_priv *priv)
-+{
-+	int ret;
-+
-+	ret = rtl8xxxu_init_phy_rf(priv, rtl8188eu_radioa_init_table, RF_A);
-+
-+	msleep(100);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_RCK2, 0x80003);
-+	msleep(100);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_RCK1, 0x00001);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_RCK2, 0x80000);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_AC, 0x33e60);
-+
-+	return ret;
-+}
-+
- static void rtl8188e_disabled_to_emu(struct rtl8xxxu_priv *priv)
- {
- 	u16 val16;
-@@ -454,6 +518,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.power_off = rtl8xxxu_power_off,
- 	.reset_8051 = rtl8xxxu_reset_8051,
- 	.init_phy_bb = rtl8188eu_init_phy_bb,
-+	.init_phy_rf = rtl8188eu_init_phy_rf,
- 	.usb_quirks = rtl8188e_usb_quirks,
- 	.writeN_block_size = 128,
- 	/*
diff --git a/package/kernel/mac80211/patches/653-0017-rtl8xxxu-Use-auto-LLT-init-for-8188e.patch b/package/kernel/mac80211/patches/653-0017-rtl8xxxu-Use-auto-LLT-init-for-8188e.patch
deleted file mode 100644
index da306deb11..0000000000
--- a/package/kernel/mac80211/patches/653-0017-rtl8xxxu-Use-auto-LLT-init-for-8188e.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 86d5a5f8e59e46c51a76a303f37ad6ce9c97b73e Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 19 Jul 2016 17:27:48 -0400
-Subject: [PATCH] rtl8xxxu: Use auto LLT init for 8188e
-
-The vendor driver uses IOL to init the LLT table for 8188e. Since we
-are trying to avoid dealing with IOL for now, gamble that auto LLT
-will work.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -517,6 +517,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.power_on = rtl8188eu_power_on,
- 	.power_off = rtl8xxxu_power_off,
- 	.reset_8051 = rtl8xxxu_reset_8051,
-+	.llt_init = rtl8xxxu_auto_llt_table,
- 	.init_phy_bb = rtl8188eu_init_phy_bb,
- 	.init_phy_rf = rtl8188eu_init_phy_rf,
- 	.usb_quirks = rtl8188e_usb_quirks,
diff --git a/package/kernel/mac80211/patches/653-0018-rtl8xxxu-Do-not-set-REG_FPGA0_TX_INFO-on-8188eu.patch b/package/kernel/mac80211/patches/653-0018-rtl8xxxu-Do-not-set-REG_FPGA0_TX_INFO-on-8188eu.patch
deleted file mode 100644
index 7d150eb31f..0000000000
--- a/package/kernel/mac80211/patches/653-0018-rtl8xxxu-Do-not-set-REG_FPGA0_TX_INFO-on-8188eu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 519d0047f84cdd1050418bb86dd34a0c6df1206a Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 20 Jul 2016 14:32:46 -0400
-Subject: [PATCH] rtl8xxxu: Do not set REG_FPGA0_TX_INFO on 8188eu
-
-The vendor driver doesn't set this for 8188eu either. It is unclear if
-this is only relevant for gen1 parts.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -3962,7 +3962,8 @@ static int rtl8xxxu_init_device(struct i
- 		goto exit;
- 
- 	/* RFSW Control - clear bit 14 ?? */
--	if (priv->rtl_chip != RTL8723B && priv->rtl_chip != RTL8192E)
-+	if (priv->rtl_chip != RTL8723B && priv->rtl_chip != RTL8192E &&
-+	    priv->rtl_chip != RTL8188E)
- 		rtl8xxxu_write32(priv, REG_FPGA0_TX_INFO, 0x00000003);
- 
- 	val32 = FPGA0_RF_TRSW | FPGA0_RF_TRSWB | FPGA0_RF_ANTSW |
diff --git a/package/kernel/mac80211/patches/653-0019-rtl8xxxu-Do-not-mess-with-REG_FPGA0_XA_RF_INT_OE-eit.patch b/package/kernel/mac80211/patches/653-0019-rtl8xxxu-Do-not-mess-with-REG_FPGA0_XA_RF_INT_OE-eit.patch
deleted file mode 100644
index 0a3bab0524..0000000000
--- a/package/kernel/mac80211/patches/653-0019-rtl8xxxu-Do-not-mess-with-REG_FPGA0_XA_RF_INT_OE-eit.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a4234121f383eed37e0a5ea8aed56bb75027305c Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 20 Jul 2016 14:38:23 -0400
-Subject: [PATCH] rtl8xxxu: Do not mess with REG_FPGA0_XA_RF_INT_OE either on
- 8188eu
-
-On older devices the vendor driver hard codes a value into
-REG_FPGA0_XA_RF_INT_OE for antenna selection. This probably shouldn't
-be done in the first place, but more investigation needs to be done to
-figure out how this really works.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -3976,7 +3976,7 @@ static int rtl8xxxu_init_device(struct i
- 	rtl8xxxu_write32(priv, REG_FPGA0_XAB_RF_SW_CTRL, val32);
- 
- 	/* 0x860[6:5]= 00 - why? - this sets antenna B */
--	if (priv->rtl_chip != RTL8192E)
-+	if (priv->rtl_chip != RTL8192E && priv->rtl_chip != RTL8188E)
- 		rtl8xxxu_write32(priv, REG_FPGA0_XA_RF_INT_OE, 0x66f60210);
- 
- 	if (!macpower) {
diff --git a/package/kernel/mac80211/patches/653-0020-rtl8xxxu-Set-transfer-page-size-for-8188eu.patch b/package/kernel/mac80211/patches/653-0020-rtl8xxxu-Set-transfer-page-size-for-8188eu.patch
deleted file mode 100644
index 595d1430ff..0000000000
--- a/package/kernel/mac80211/patches/653-0020-rtl8xxxu-Set-transfer-page-size-for-8188eu.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 497b244578992c6353d214140f026154e4f4f710 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 20 Jul 2016 15:59:31 -0400
-Subject: [PATCH] rtl8xxxu: Set transfer page size for 8188eu
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -527,6 +527,8 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	 * Max RX buffer = 10K - max(TxReportSize(64*8), WOLPattern(16*24))
- 	 */
- 	.trxff_boundary = 0x23ff,
-+	.pbp_rx = PBP_PAGE_SIZE_128,
-+	.pbp_tx = PBP_PAGE_SIZE_128,
- 	.mactable = rtl8188e_mac_init_table,
- 	.total_page_num = TX_TOTAL_PAGE_NUM_8188E,
- 	.page_num_hi = TX_PAGE_NUM_HI_PQ_8188E,
diff --git a/package/kernel/mac80211/patches/653-0021-rtl8xxxu-Enable-TX-report-timer-on-8188eu.patch b/package/kernel/mac80211/patches/653-0021-rtl8xxxu-Enable-TX-report-timer-on-8188eu.patch
deleted file mode 100644
index c1bc3fa683..0000000000
--- a/package/kernel/mac80211/patches/653-0021-rtl8xxxu-Enable-TX-report-timer-on-8188eu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a57a3fbb1a22544ce96e4dbe423694e982d54700 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 20 Jul 2016 16:13:06 -0400
-Subject: [PATCH] rtl8xxxu: Enable TX report timer on 8188eu
-
-The 8188eu uses the same TX report timer as found on the 8723b.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -522,6 +522,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.init_phy_rf = rtl8188eu_init_phy_rf,
- 	.usb_quirks = rtl8188e_usb_quirks,
- 	.writeN_block_size = 128,
-+	.has_tx_report = 1,
- 	/*
- 	 * Use 9K for 8188e normal chip
- 	 * Max RX buffer = 10K - max(TxReportSize(64*8), WOLPattern(16*24))
diff --git a/package/kernel/mac80211/patches/653-0022-rtl8xxxu-Setup-interrupts-for-8188eu.patch b/package/kernel/mac80211/patches/653-0022-rtl8xxxu-Setup-interrupts-for-8188eu.patch
deleted file mode 100644
index 774b2a2bdd..0000000000
--- a/package/kernel/mac80211/patches/653-0022-rtl8xxxu-Setup-interrupts-for-8188eu.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4c85a1704e555aa04d72e31a4a90b9c4bf01d83b Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 20 Jul 2016 16:59:18 -0400
-Subject: [PATCH] rtl8xxxu: Setup interrupts for 8188eu
-
-This sets up interrupts for 8188eu, but per vendor driver, it's not
-obvious this is really needed for USB devices.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -4041,6 +4041,15 @@ static int rtl8xxxu_init_device(struct i
- 	if (priv->rtl_chip == RTL8192E) {
- 		rtl8xxxu_write32(priv, REG_HIMR0, 0x00);
- 		rtl8xxxu_write32(priv, REG_HIMR1, 0x00);
-+	} else if (priv->rtl_chip == RTL8188E) {
-+		rtl8xxxu_write32(priv, REG_HISR0, 0xffffffff);
-+		val32 = IMR0_PSTIMEOUT | IMR0_TBDER | IMR0_CPWM | IMR0_CPWM2;
-+		rtl8xxxu_write32(priv, REG_HIMR0, val32);
-+		val32 = IMR1_TXERR | IMR1_RXERR | IMR1_TXFOVW | IMR1_RXFOVW;
-+		rtl8xxxu_write32(priv, REG_HIMR1, val32);
-+		val8 = rtl8xxxu_read8(priv, REG_USB_SPECIAL_OPTION);
-+		val8 |= USB_SPEC_INT_BULK_SELECT;
-+		rtl8xxxu_write8(priv, REG_USB_SPECIAL_OPTION, val8);
- 	} else {
- 		/*
- 		 * Enable all interrupts - not obvious USB needs to do this
diff --git a/package/kernel/mac80211/patches/653-0023-rtl8xxxu-Use-rxdesc16-and-32-byte-tx-descriptors-for.patch b/package/kernel/mac80211/patches/653-0023-rtl8xxxu-Use-rxdesc16-and-32-byte-tx-descriptors-for.patch
deleted file mode 100644
index c46522ecbb..0000000000
--- a/package/kernel/mac80211/patches/653-0023-rtl8xxxu-Use-rxdesc16-and-32-byte-tx-descriptors-for.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 444b8212457b611f482ee6a5f52e8a14e6881f6e Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Thu, 21 Jul 2016 14:52:49 -0400
-Subject: [PATCH] rtl8xxxu: Use rxdesc16 and 32 byte tx descriptors for 8188eu
-
-The RX descriptor format looks like the gen1 RX descriptor format, so
-use that for now.
-
-The TX descriptor format is different and looks to be some bizarre
-hybrid of the gen1 and gen2 formats.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -520,8 +520,11 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.llt_init = rtl8xxxu_auto_llt_table,
- 	.init_phy_bb = rtl8188eu_init_phy_bb,
- 	.init_phy_rf = rtl8188eu_init_phy_rf,
-+	.parse_rx_desc = rtl8xxxu_parse_rxdesc16,
- 	.usb_quirks = rtl8188e_usb_quirks,
- 	.writeN_block_size = 128,
-+	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc16),
-+	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
- 	.has_tx_report = 1,
- 	/*
- 	 * Use 9K for 8188e normal chip
diff --git a/package/kernel/mac80211/patches/653-0024-rtl8xxxu-8188eu-use-same-ADDA-on-parameters-as-8723a.patch b/package/kernel/mac80211/patches/653-0024-rtl8xxxu-8188eu-use-same-ADDA-on-parameters-as-8723a.patch
deleted file mode 100644
index 3177ee35fc..0000000000
--- a/package/kernel/mac80211/patches/653-0024-rtl8xxxu-8188eu-use-same-ADDA-on-parameters-as-8723a.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 399409ff2196eb6d3f758579b63a1091fff93870 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Thu, 21 Jul 2016 15:23:16 -0400
-Subject: [PATCH] rtl8xxxu: 8188eu use same ADDA on parameters as 8723au/8192cu
-
-For ADDA setup the 8188eu looks to match the gen1 parts.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -526,6 +526,10 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc16),
- 	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
- 	.has_tx_report = 1,
-+	.adda_1t_init = 0x0b1b25a0,
-+	.adda_1t_path_on = 0x0bdb25a0,
-+	.adda_2t_path_on_a = 0x04db25a4,
-+	.adda_2t_path_on_b = 0x0b1b25a4,
- 	/*
- 	 * Use 9K for 8188e normal chip
- 	 * Max RX buffer = 10K - max(TxReportSize(64*8), WOLPattern(16*24))
diff --git a/package/kernel/mac80211/patches/653-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch b/package/kernel/mac80211/patches/653-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch
deleted file mode 100644
index ce76a67d9e..0000000000
--- a/package/kernel/mac80211/patches/653-0025-rtl8xxxu-Add-PHY-IQ-calibration-code-for-8188eu.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-From 9a3c53da5228607375ab69d6e3cbc375f18a4f82 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Thu, 21 Jul 2016 17:25:56 -0400
-Subject: [PATCH] rtl8xxxu: Add PHY IQ calibration code for 8188eu
-
-The vendor driver for 8188eu is a bizarre modern style code for path A
-and old-style code for path B. Most likely because the 8188eu is a
-1T1R part which never gets to the path B code.
-
-Eventually we should look into unifying all the IQ calibration code.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 489 +++++++++++++++++++++
- 1 file changed, 489 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -384,6 +384,494 @@ static int rtl8188eu_init_phy_rf(struct
- 	return ret;
- }
- 
-+static int rtl8188eu_iqk_path_a(struct rtl8xxxu_priv *priv)
-+{
-+	u32 reg_eac, reg_e94, reg_e9c;
-+	int result = 0;
-+
-+	/* Path A IQK setting */
-+	rtl8xxxu_write32(priv, REG_TX_IQK_TONE_A, 0x10008c1c);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_TONE_A, 0x30008c1c);
-+
-+	rtl8xxxu_write32(priv, REG_TX_IQK_PI_A, 0x8214032a);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_PI_A, 0x28160000);
-+
-+	/* LO calibration setting */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_RSP, 0x00462911);
-+
-+	/* One shot, path A LOK & IQK */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf9000000);
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf8000000);
-+
-+	mdelay(10);
-+
-+	/* Check failed */
-+	reg_eac = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_A_2);
-+	reg_e94 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_A);
-+	reg_e9c = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_A);
-+
-+	if (!(reg_eac & BIT(28)) &&
-+	    ((reg_e94 & 0x03ff0000) != 0x01420000) &&
-+	    ((reg_e9c & 0x03ff0000) != 0x00420000))
-+		result |= 0x01;
-+
-+	return result;
-+}
-+
-+static int rtl8188eu_rx_iqk_path_a(struct rtl8xxxu_priv *priv)
-+{
-+	u32 reg_ea4, reg_eac, reg_e94, reg_e9c, val32;
-+	int result = 0;
-+
-+	/* Leave IQK mode */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x00);
-+
-+	/* Enable path A PA in TX IQK mode */
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_WE_LUT, 0x800a0);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_RCK_OS, 0x30000);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_TXPA_G1, 0x0000f);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_TXPA_G2, 0xf117b);
-+
-+	/* PA/PAD control by 0x56, and set = 0x0 */
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_UNKNOWN_DF, 0x00980);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_UNKNOWN_56, 0x51000);
-+
-+	/* Enter IQK mode */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x80800000);
-+
-+	/* TX IQK setting */
-+	rtl8xxxu_write32(priv, REG_TX_IQK, 0x01007c00);
-+	rtl8xxxu_write32(priv, REG_RX_IQK, 0x81004800);
-+
-+	/* path-A IQK setting */
-+	rtl8xxxu_write32(priv, REG_TX_IQK_TONE_A, 0x10008c1c);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_TONE_A, 0x30008c1c);
-+
-+	rtl8xxxu_write32(priv, REG_TX_IQK_PI_A, 0x82160c1f);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_PI_A, 0x28160000);
-+
-+	/* LO calibration setting */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_RSP, 0x0046a911);
-+
-+	/* One shot, path A LOK & IQK */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf9000000);
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf8000000);
-+
-+	mdelay(10);
-+
-+	/* Check failed */
-+	reg_eac = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_A_2);
-+	reg_e94 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_A);
-+	reg_e9c = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_A);
-+
-+	if (!(reg_eac & BIT(28)) &&
-+	    ((reg_e94 & 0x03ff0000) != 0x01420000) &&
-+	    ((reg_e9c & 0x03ff0000) != 0x00420000)) {
-+		result |= 0x01;
-+	} else {
-+		/* PA/PAD controlled by 0x0 */
-+		rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x00000000);
-+		rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_UNKNOWN_DF, 0x180);
-+		goto out;
-+	}
-+
-+	val32 = 0x80007c00 |
-+		(reg_e94 & 0x03ff0000) | ((reg_e9c >> 16) & 0x03ff);
-+	rtl8xxxu_write32(priv, REG_TX_IQK, val32);
-+
-+	/* Modify RX IQK mode table */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x00000000);
-+
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_WE_LUT, 0x800a0);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_RCK_OS, 0x30000);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_TXPA_G1, 0x0000f);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_TXPA_G2, 0xf7ffa);
-+
-+	/* Enter IQK mode */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x80800000);
-+
-+	/* IQK setting */
-+	rtl8xxxu_write32(priv, REG_RX_IQK, 0x01004800);
-+
-+	/* Path A IQK setting */
-+	rtl8xxxu_write32(priv, REG_TX_IQK_TONE_A, 0x38008c1c);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_TONE_A, 0x18008c1c);
-+
-+	rtl8xxxu_write32(priv, REG_TX_IQK_PI_A, 0x82160c05);
-+	rtl8xxxu_write32(priv, REG_RX_IQK_PI_A, 0x28160c1f);
-+
-+	/* LO calibration setting */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_RSP, 0x0046a911);
-+
-+	/* One shot, path A LOK & IQK */
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf9000000);
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_PTS, 0xf8000000);
-+
-+	mdelay(10);
-+
-+	reg_eac = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_A_2);
-+	reg_ea4 = rtl8xxxu_read32(priv, REG_RX_POWER_BEFORE_IQK_A_2);
-+
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x00000000);
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_UNKNOWN_DF, 0x180);
-+
-+	if (!(reg_eac & BIT(27)) &&
-+	    ((reg_ea4 & 0x03ff0000) != 0x01320000) &&
-+	    ((reg_eac & 0x03ff0000) != 0x00360000))
-+		result |= 0x02;
-+	else
-+		dev_warn(&priv->udev->dev, "%s: Path A RX IQK failed!\n",
-+			 __func__);
-+
-+out:
-+	return result;
-+}
-+
-+static int rtl8188eu_iqk_path_b(struct rtl8xxxu_priv *priv)
-+{
-+	u32 reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc;
-+	int result = 0;
-+
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_CONT, 0x00000002);
-+	rtl8xxxu_write32(priv, REG_IQK_AGC_CONT, 0x00000000);
-+
-+	mdelay(1);
-+
-+	/* Check failed */
-+	reg_eac = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_A_2);
-+	reg_eb4 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_B);
-+	reg_ebc = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_B);
-+	reg_ec4 = rtl8xxxu_read32(priv, REG_RX_POWER_BEFORE_IQK_B_2);
-+	reg_ecc = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_B_2);
-+
-+	if (!(reg_eac & BIT(31)) &&
-+	    ((reg_eb4 & 0x03ff0000) != 0x01420000) &&
-+	    ((reg_ebc & 0x03ff0000) != 0x00420000))
-+		result |= 0x01;
-+	else
-+		dev_warn(&priv->udev->dev, "%s: Path B IQK failed!\n",
-+			 __func__);
-+
-+	if (!(reg_eac & BIT(30)) &&
-+	    ((reg_ec4 & 0x03ff0000) != 0x01320000) &&
-+	    ((reg_ecc & 0x03ff0000) != 0x00360000))
-+		result |= 0x01;
-+	else
-+		dev_warn(&priv->udev->dev, "%s: Path B RX IQK failed!\n",
-+			 __func__);
-+
-+	return result;
-+}
-+
-+static void rtl8188eu_phy_iqcalibrate(struct rtl8xxxu_priv *priv,
-+				      int result[][8], int t)
-+{
-+	struct device *dev = &priv->udev->dev;
-+	u32 i, val32;
-+	int path_a_ok, path_b_ok;
-+	int retry = 2;
-+	const u32 adda_regs[RTL8XXXU_ADDA_REGS] = {
-+		REG_FPGA0_XCD_SWITCH_CTRL, REG_BLUETOOTH,
-+		REG_RX_WAIT_CCA, REG_TX_CCK_RFON,
-+		REG_TX_CCK_BBON, REG_TX_OFDM_RFON,
-+		REG_TX_OFDM_BBON, REG_TX_TO_RX,
-+		REG_TX_TO_TX, REG_RX_CCK,
-+		REG_RX_OFDM, REG_RX_WAIT_RIFS,
-+		REG_RX_TO_RX, REG_STANDBY,
-+		REG_SLEEP, REG_PMPD_ANAEN
-+	};
-+	const u32 iqk_mac_regs[RTL8XXXU_MAC_REGS] = {
-+		REG_TXPAUSE, REG_BEACON_CTRL,
-+		REG_BEACON_CTRL_1, REG_GPIO_MUXCFG
-+	};
-+	const u32 iqk_bb_regs[RTL8XXXU_BB_REGS] = {
-+		REG_OFDM0_TRX_PATH_ENABLE, REG_OFDM0_TR_MUX_PAR,
-+		REG_FPGA0_XCD_RF_SW_CTRL, REG_CONFIG_ANT_A, REG_CONFIG_ANT_B,
-+		REG_FPGA0_XAB_RF_SW_CTRL, REG_FPGA0_XA_RF_INT_OE,
-+		REG_FPGA0_XB_RF_INT_OE, REG_FPGA0_RF_MODE
-+	};
-+
-+	/*
-+	 * Note: IQ calibration must be performed after loading
-+	 *       PHY_REG.txt , and radio_a, radio_b.txt
-+	 */
-+
-+	if (t == 0) {
-+		/* Save ADDA parameters, turn Path A ADDA on */
-+		rtl8xxxu_save_regs(priv, adda_regs, priv->adda_backup,
-+				   RTL8XXXU_ADDA_REGS);
-+		rtl8xxxu_save_mac_regs(priv, iqk_mac_regs, priv->mac_backup);
-+		rtl8xxxu_save_regs(priv, iqk_bb_regs,
-+				   priv->bb_backup, RTL8XXXU_BB_REGS);
-+	}
-+
-+	rtl8xxxu_path_adda_on(priv, adda_regs, true);
-+
-+	if (t == 0) {
-+		val32 = rtl8xxxu_read32(priv, REG_FPGA0_XA_HSSI_PARM1);
-+		if (val32 & FPGA0_HSSI_PARM1_PI)
-+			priv->pi_enabled = 1;
-+	}
-+
-+	if (!priv->pi_enabled) {
-+		/* Switch BB to PI mode to do IQ Calibration. */
-+		rtl8xxxu_write32(priv, REG_FPGA0_XA_HSSI_PARM1, 0x01000100);
-+		rtl8xxxu_write32(priv, REG_FPGA0_XB_HSSI_PARM1, 0x01000100);
-+	}
-+
-+	val32 = rtl8xxxu_read32(priv, REG_FPGA0_RF_MODE);
-+	val32 &= ~FPGA_RF_MODE_CCK;
-+	rtl8xxxu_write32(priv, REG_FPGA0_RF_MODE, val32);
-+
-+	rtl8xxxu_write32(priv, REG_OFDM0_TRX_PATH_ENABLE, 0x03a05600);
-+	rtl8xxxu_write32(priv, REG_OFDM0_TR_MUX_PAR, 0x000800e4);
-+	rtl8xxxu_write32(priv, REG_FPGA0_XCD_RF_SW_CTRL, 0x22204000);
-+
-+	if (!priv->no_pape) {
-+		val32 = rtl8xxxu_read32(priv, REG_FPGA0_XAB_RF_SW_CTRL);
-+		val32 |= (FPGA0_RF_PAPE |
-+			  (FPGA0_RF_PAPE << FPGA0_RF_BD_CTRL_SHIFT));
-+		rtl8xxxu_write32(priv, REG_FPGA0_XAB_RF_SW_CTRL, val32);
-+	}
-+
-+	val32 = rtl8xxxu_read32(priv, REG_FPGA0_XA_RF_INT_OE);
-+	val32 &= ~BIT(10);
-+	rtl8xxxu_write32(priv, REG_FPGA0_XA_RF_INT_OE, val32);
-+	val32 = rtl8xxxu_read32(priv, REG_FPGA0_XB_RF_INT_OE);
-+	val32 &= ~BIT(10);
-+	rtl8xxxu_write32(priv, REG_FPGA0_XB_RF_INT_OE, val32);
-+
-+	if (priv->tx_paths > 1) {
-+		rtl8xxxu_write32(priv, REG_FPGA0_XA_LSSI_PARM, 0x00010000);
-+		rtl8xxxu_write32(priv, REG_FPGA0_XB_LSSI_PARM, 0x00010000);
-+	}
-+
-+	/* MAC settings */
-+	rtl8xxxu_mac_calibration(priv, iqk_mac_regs, priv->mac_backup);
-+
-+	/* Page B init */
-+	rtl8xxxu_write32(priv, REG_CONFIG_ANT_A, 0x0f600000);
-+
-+	if (priv->tx_paths > 1)
-+		rtl8xxxu_write32(priv, REG_CONFIG_ANT_B, 0x0f600000);
-+
-+	/* IQ calibration setting */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x80800000);
-+	rtl8xxxu_write32(priv, REG_TX_IQK, 0x01007c00);
-+	rtl8xxxu_write32(priv, REG_RX_IQK, 0x81004800);
-+
-+	for (i = 0; i < retry; i++) {
-+		path_a_ok = rtl8188eu_iqk_path_a(priv);
-+		if (path_a_ok == 0x01) {
-+			val32 = rtl8xxxu_read32(priv,
-+						REG_TX_POWER_BEFORE_IQK_A);
-+			result[t][0] = (val32 >> 16) & 0x3ff;
-+			val32 = rtl8xxxu_read32(priv,
-+						REG_TX_POWER_AFTER_IQK_A);
-+			result[t][1] = (val32 >> 16) & 0x3ff;
-+			break;
-+		}
-+	}
-+
-+	if (!path_a_ok)
-+		dev_dbg(dev, "%s: Path A TX IQK failed!\n", __func__);
-+
-+	for (i = 0; i < retry; i++) {
-+		path_a_ok = rtl8188eu_rx_iqk_path_a(priv);
-+		if (path_a_ok == 0x03) {
-+			val32 = rtl8xxxu_read32(priv,
-+						REG_RX_POWER_BEFORE_IQK_A_2);
-+			result[t][2] = (val32 >> 16) & 0x3ff;
-+			val32 = rtl8xxxu_read32(priv,
-+						REG_RX_POWER_AFTER_IQK_A_2);
-+			result[t][3] = (val32 >> 16) & 0x3ff;
-+
-+			break;
-+		}
-+	}
-+
-+	if (!path_a_ok)
-+		dev_dbg(dev, "%s: Path A RX IQK failed!\n", __func__);
-+
-+	/*
-+	 * Path B calibration code in the vendor driver seems to be
-+	 * old style and not updated for the 8188eu since it's a 1T1R
-+	 * part. Keeping the code here in sync with the vendor code
-+	 * to not divert unncessarily, but probably would be good to
-+	 * look into modernizing all the code including that for the
-+	 * old gen1 devices
-+	 */
-+	if (priv->tx_paths > 1) {
-+		/*
-+		 * Path A into standby
-+		 */
-+		rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x0);
-+		rtl8xxxu_write32(priv, REG_FPGA0_XA_LSSI_PARM, 0x00010000);
-+		rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0x80800000);
-+
-+		/* Turn Path B ADDA on */
-+		rtl8xxxu_path_adda_on(priv, adda_regs, false);
-+
-+		for (i = 0; i < retry; i++) {
-+			path_b_ok = rtl8188eu_iqk_path_b(priv);
-+			if (path_b_ok == 0x03) {
-+				val32 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_B);
-+				result[t][4] = (val32 >> 16) & 0x3ff;
-+				val32 = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_B);
-+				result[t][5] = (val32 >> 16) & 0x3ff;
-+				val32 = rtl8xxxu_read32(priv, REG_RX_POWER_BEFORE_IQK_B_2);
-+				result[t][6] = (val32 >> 16) & 0x3ff;
-+				val32 = rtl8xxxu_read32(priv, REG_RX_POWER_AFTER_IQK_B_2);
-+				result[t][7] = (val32 >> 16) & 0x3ff;
-+				break;
-+			} else if (i == (retry - 1) && path_b_ok == 0x01) {
-+				/* TX IQK OK */
-+				val32 = rtl8xxxu_read32(priv, REG_TX_POWER_BEFORE_IQK_B);
-+				result[t][4] = (val32 >> 16) & 0x3ff;
-+				val32 = rtl8xxxu_read32(priv, REG_TX_POWER_AFTER_IQK_B);
-+				result[t][5] = (val32 >> 16) & 0x3ff;
-+			}
-+		}
-+
-+		if (!path_b_ok)
-+			dev_dbg(dev, "%s: Path B IQK failed!\n", __func__);
-+	}
-+
-+	/* Back to BB mode, load original value */
-+	rtl8xxxu_write32(priv, REG_FPGA0_IQK, 0);
-+
-+	if (t) {
-+		if (!priv->pi_enabled) {
-+			/*
-+			 * Switch back BB to SI mode after finishing
-+			 * IQ Calibration
-+			 */
-+			val32 = 0x01000000;
-+			rtl8xxxu_write32(priv, REG_FPGA0_XA_HSSI_PARM1, val32);
-+			rtl8xxxu_write32(priv, REG_FPGA0_XB_HSSI_PARM1, val32);
-+		}
-+
-+		/* Reload ADDA power saving parameters */
-+		rtl8xxxu_restore_regs(priv, adda_regs, priv->adda_backup,
-+				      RTL8XXXU_ADDA_REGS);
-+
-+		/* Reload MAC parameters */
-+		rtl8xxxu_restore_mac_regs(priv, iqk_mac_regs, priv->mac_backup);
-+
-+		/* Reload BB parameters */
-+		rtl8xxxu_restore_regs(priv, iqk_bb_regs,
-+				      priv->bb_backup, RTL8XXXU_BB_REGS);
-+
-+		/* Restore RX initial gain */
-+		rtl8xxxu_write32(priv, REG_FPGA0_XA_LSSI_PARM, 0x00032ed3);
-+
-+		if (priv->tx_paths > 1) {
-+			rtl8xxxu_write32(priv, REG_FPGA0_XB_LSSI_PARM,
-+					 0x00032ed3);
-+		}
-+
-+		/* Load 0xe30 IQC default value */
-+		rtl8xxxu_write32(priv, REG_TX_IQK_TONE_A, 0x01008c00);
-+		rtl8xxxu_write32(priv, REG_RX_IQK_TONE_A, 0x01008c00);
-+	}
-+}
-+
-+static void rtl8188eu_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
-+{
-+	struct device *dev = &priv->udev->dev;
-+	int result[4][8];	/* last is final result */
-+	int i, candidate;
-+	bool path_a_ok, path_b_ok;
-+	u32 reg_e94, reg_e9c, reg_ea4, reg_eac;
-+	u32 reg_eb4, reg_ebc, reg_ec4, reg_ecc;
-+	bool simu;
-+
-+	memset(result, 0, sizeof(result));
-+	result[3][0] = 0x100;
-+	result[3][2] = 0x100;
-+	result[3][4] = 0x100;
-+	result[3][6] = 0x100;
-+
-+	candidate = -1;
-+
-+	path_a_ok = false;
-+	path_b_ok = false;
-+
-+	for (i = 0; i < 3; i++) {
-+		rtl8188eu_phy_iqcalibrate(priv, result, i);
-+
-+		if (i == 1) {
-+			simu = rtl8xxxu_gen2_simularity_compare(priv,
-+								result, 0, 1);
-+			if (simu) {
-+				candidate = 0;
-+				break;
-+			}
-+		}
-+
-+		if (i == 2) {
-+			simu = rtl8xxxu_gen2_simularity_compare(priv,
-+								result, 0, 2);
-+			if (simu) {
-+				candidate = 0;
-+				break;
-+			}
-+
-+			simu = rtl8xxxu_gen2_simularity_compare(priv,
-+								result, 1, 2);
-+			if (simu)
-+				candidate = 1;
-+			else
-+				candidate = 3;
-+		}
-+	}
-+
-+	for (i = 0; i < 4; i++) {
-+		reg_e94 = result[i][0];
-+		reg_e9c = result[i][1];
-+		reg_ea4 = result[i][2];
-+		reg_eb4 = result[i][4];
-+		reg_ebc = result[i][5];
-+		reg_ec4 = result[i][6];
-+	}
-+
-+	if (candidate >= 0) {
-+		reg_e94 = result[candidate][0];
-+		priv->rege94 =  reg_e94;
-+		reg_e9c = result[candidate][1];
-+		priv->rege9c = reg_e9c;
-+		reg_ea4 = result[candidate][2];
-+		reg_eac = result[candidate][3];
-+		reg_eb4 = result[candidate][4];
-+		priv->regeb4 = reg_eb4;
-+		reg_ebc = result[candidate][5];
-+		priv->regebc = reg_ebc;
-+		reg_ec4 = result[candidate][6];
-+		reg_ecc = result[candidate][7];
-+		dev_dbg(dev, "%s: candidate is %x\n", __func__, candidate);
-+		dev_dbg(dev,
-+			"%s: e94 =%x e9c=%x ea4=%x eac=%x eb4=%x ebc=%x ec4=%x "
-+			"ecc=%x\n ", __func__, reg_e94, reg_e9c,
-+			reg_ea4, reg_eac, reg_eb4, reg_ebc, reg_ec4, reg_ecc);
-+		path_a_ok = true;
-+		path_b_ok = true;
-+	} else {
-+		reg_e94 = reg_eb4 = priv->rege94 = priv->regeb4 = 0x100;
-+		reg_e9c = reg_ebc = priv->rege9c = priv->regebc = 0x0;
-+	}
-+
-+	if (reg_e94 && candidate >= 0)
-+		rtl8xxxu_fill_iqk_matrix_a(priv, path_a_ok, result,
-+					   candidate, (reg_ea4 == 0));
-+
-+	if (priv->rf_paths > 1 && reg_eb4)
-+		rtl8xxxu_fill_iqk_matrix_b(priv, path_b_ok, result,
-+					   candidate, (reg_ec4 == 0));
-+
-+	rtl8xxxu_save_regs(priv, rtl8xxxu_iqk_phy_iq_bb_reg,
-+			   priv->bb_recovery_backup, RTL8XXXU_BB_REGS);
-+}
-+
- static void rtl8188e_disabled_to_emu(struct rtl8xxxu_priv *priv)
- {
- 	u16 val16;
-@@ -520,6 +1008,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.llt_init = rtl8xxxu_auto_llt_table,
- 	.init_phy_bb = rtl8188eu_init_phy_bb,
- 	.init_phy_rf = rtl8188eu_init_phy_rf,
-+	.phy_iq_calibrate = rtl8188eu_phy_iq_calibrate,
- 	.parse_rx_desc = rtl8xxxu_parse_rxdesc16,
- 	.usb_quirks = rtl8188e_usb_quirks,
- 	.writeN_block_size = 128,
diff --git a/package/kernel/mac80211/patches/653-0026-rtl8xxxu-8188eu-uses-the-gen2-thermal-meter.patch b/package/kernel/mac80211/patches/653-0026-rtl8xxxu-8188eu-uses-the-gen2-thermal-meter.patch
deleted file mode 100644
index 81b1d848a3..0000000000
--- a/package/kernel/mac80211/patches/653-0026-rtl8xxxu-8188eu-uses-the-gen2-thermal-meter.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e33fed77d7493ef16c3afd32eb0d7c99fc95bfad Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 22 Jul 2016 11:20:00 -0400
-Subject: [PATCH] rtl8xxxu: 8188eu uses the gen2 thermal meter
-
-Vendor driver writes thermal meter setup to RF register 0x42, hence
-the gen2 setup. However the driver doesn't do much with it.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1015,6 +1015,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc16),
- 	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
- 	.has_tx_report = 1,
-+	.gen2_thermal_meter = 1,
- 	.adda_1t_init = 0x0b1b25a0,
- 	.adda_1t_path_on = 0x0bdb25a0,
- 	.adda_2t_path_on_a = 0x04db25a4,
diff --git a/package/kernel/mac80211/patches/653-0027-rtl8xxxu-Set-REG_USB_HRPWM-to-0-for-8188eu.patch b/package/kernel/mac80211/patches/653-0027-rtl8xxxu-Set-REG_USB_HRPWM-to-0-for-8188eu.patch
deleted file mode 100644
index 4c242453b8..0000000000
--- a/package/kernel/mac80211/patches/653-0027-rtl8xxxu-Set-REG_USB_HRPWM-to-0-for-8188eu.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 42808faad1b2cf0366a39074c08dbd181fa51b07 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 22 Jul 2016 11:33:29 -0400
-Subject: [PATCH] rtl8xxxu: Set REG_USB_HRPWM to 0 for 8188eu
-
-This matches what 8192eu does
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -4240,7 +4240,7 @@ static int rtl8xxxu_init_device(struct i
- 			val32 |= FPGA_RF_MODE_CCK;
- 			rtl8xxxu_write32(priv, REG_FPGA0_RF_MODE, val32);
- 		}
--	} else if (priv->rtl_chip == RTL8192E) {
-+	} else if (priv->rtl_chip == RTL8192E || priv->rtl_chip == RTL8188E) {
- 		rtl8xxxu_write8(priv, REG_USB_HRPWM, 0x00);
- 	}
- 
diff --git a/package/kernel/mac80211/patches/653-0028-rtl8xxxu-Implement-rtl8188eu_config_channel.patch b/package/kernel/mac80211/patches/653-0028-rtl8xxxu-Implement-rtl8188eu_config_channel.patch
deleted file mode 100644
index a397125e8c..0000000000
--- a/package/kernel/mac80211/patches/653-0028-rtl8xxxu-Implement-rtl8188eu_config_channel.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 9796f3807764567ecde6e3787a66e4b4edbc35df Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 22 Jul 2016 11:40:13 -0400
-Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_config_channel()
-
-The 8188eu doesn't seem to have REG_FPGA0_ANALOG2, so implement it's
-own specific version.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 117 +++++++++++++++++++++
- 1 file changed, 117 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -283,6 +283,122 @@ static struct rtl8xxxu_rfregval rtl8188e
- 	{0xff, 0xffffffff}
- };
- 
-+void rtl8188eu_config_channel(struct ieee80211_hw *hw)
-+{
-+	struct rtl8xxxu_priv *priv = hw->priv;
-+	u32 val32, rsr;
-+	u8 val8, opmode;
-+	bool ht = true;
-+	int sec_ch_above, channel;
-+	int i;
-+
-+	opmode = rtl8xxxu_read8(priv, REG_BW_OPMODE);
-+	rsr = rtl8xxxu_read32(priv, REG_RESPONSE_RATE_SET);
-+	channel = hw->conf.chandef.chan->hw_value;
-+
-+	switch (hw->conf.chandef.width) {
-+	case NL80211_CHAN_WIDTH_20_NOHT:
-+		ht = false;
-+	case NL80211_CHAN_WIDTH_20:
-+		opmode |= BW_OPMODE_20MHZ;
-+		rtl8xxxu_write8(priv, REG_BW_OPMODE, opmode);
-+
-+		val32 = rtl8xxxu_read32(priv, REG_FPGA0_RF_MODE);
-+		val32 &= ~FPGA_RF_MODE;
-+		rtl8xxxu_write32(priv, REG_FPGA0_RF_MODE, val32);
-+
-+		val32 = rtl8xxxu_read32(priv, REG_FPGA1_RF_MODE);
-+		val32 &= ~FPGA_RF_MODE;
-+		rtl8xxxu_write32(priv, REG_FPGA1_RF_MODE, val32);
-+		break;
-+	case NL80211_CHAN_WIDTH_40:
-+		if (hw->conf.chandef.center_freq1 >
-+		    hw->conf.chandef.chan->center_freq) {
-+			sec_ch_above = 1;
-+			channel += 2;
-+		} else {
-+			sec_ch_above = 0;
-+			channel -= 2;
-+		}
-+
-+		opmode &= ~BW_OPMODE_20MHZ;
-+		rtl8xxxu_write8(priv, REG_BW_OPMODE, opmode);
-+		rsr &= ~RSR_RSC_BANDWIDTH_40M;
-+		if (sec_ch_above)
-+			rsr |= RSR_RSC_UPPER_SUB_CHANNEL;
-+		else
-+			rsr |= RSR_RSC_LOWER_SUB_CHANNEL;
-+		rtl8xxxu_write32(priv, REG_RESPONSE_RATE_SET, rsr);
-+
-+		val32 = rtl8xxxu_read32(priv, REG_FPGA0_RF_MODE);
-+		val32 |= FPGA_RF_MODE;
-+		rtl8xxxu_write32(priv, REG_FPGA0_RF_MODE, val32);
-+
-+		val32 = rtl8xxxu_read32(priv, REG_FPGA1_RF_MODE);
-+		val32 |= FPGA_RF_MODE;
-+		rtl8xxxu_write32(priv, REG_FPGA1_RF_MODE, val32);
-+
-+		/*
-+		 * Set Control channel to upper or lower. These settings
-+		 * are required only for 40MHz
-+		 */
-+		val32 = rtl8xxxu_read32(priv, REG_CCK0_SYSTEM);
-+		val32 &= ~CCK0_SIDEBAND;
-+		if (!sec_ch_above)
-+			val32 |= CCK0_SIDEBAND;
-+		rtl8xxxu_write32(priv, REG_CCK0_SYSTEM, val32);
-+
-+		val32 = rtl8xxxu_read32(priv, REG_OFDM1_LSTF);
-+		val32 &= ~OFDM_LSTF_PRIME_CH_MASK; /* 0xc00 */
-+		if (sec_ch_above)
-+			val32 |= OFDM_LSTF_PRIME_CH_LOW;
-+		else
-+			val32 |= OFDM_LSTF_PRIME_CH_HIGH;
-+		rtl8xxxu_write32(priv, REG_OFDM1_LSTF, val32);
-+
-+		val32 = rtl8xxxu_read32(priv, REG_FPGA0_POWER_SAVE);
-+		val32 &= ~(FPGA0_PS_LOWER_CHANNEL | FPGA0_PS_UPPER_CHANNEL);
-+		if (sec_ch_above)
-+			val32 |= FPGA0_PS_UPPER_CHANNEL;
-+		else
-+			val32 |= FPGA0_PS_LOWER_CHANNEL;
-+		rtl8xxxu_write32(priv, REG_FPGA0_POWER_SAVE, val32);
-+		break;
-+
-+	default:
-+		break;
-+	}
-+
-+	for (i = RF_A; i < priv->rf_paths; i++) {
-+		val32 = rtl8xxxu_read_rfreg(priv, i, RF6052_REG_MODE_AG);
-+		val32 &= ~MODE_AG_CHANNEL_MASK;
-+		val32 |= channel;
-+		rtl8xxxu_write_rfreg(priv, i, RF6052_REG_MODE_AG, val32);
-+	}
-+
-+	if (ht)
-+		val8 = 0x0e;
-+	else
-+		val8 = 0x0a;
-+
-+#if 0
-+	rtl8xxxu_write8(priv, REG_SIFS_CCK + 1, val8);
-+	rtl8xxxu_write8(priv, REG_SIFS_OFDM + 1, val8);
-+
-+	rtl8xxxu_write16(priv, REG_R2T_SIFS, 0x0808);
-+	rtl8xxxu_write16(priv, REG_T2T_SIFS, 0x0a0a);
-+#endif
-+
-+	for (i = RF_A; i < priv->rf_paths; i++) {
-+		val32 = rtl8xxxu_read_rfreg(priv, i, RF6052_REG_MODE_AG);
-+		if (hw->conf.chandef.width == NL80211_CHAN_WIDTH_40)
-+			val32 &= ~MODE_AG_CHANNEL_20MHZ;
-+		else
-+			val32 |= MODE_AG_CHANNEL_20MHZ;
-+		rtl8xxxu_write_rfreg(priv, i, RF6052_REG_MODE_AG, val32);
-+	}
-+}
-+
- static int rtl8188eu_parse_efuse(struct rtl8xxxu_priv *priv)
- {
- 	struct rtl8188eu_efuse *efuse = &priv->efuse_wifi.efuse8188eu;
-@@ -1009,6 +1125,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.init_phy_bb = rtl8188eu_init_phy_bb,
- 	.init_phy_rf = rtl8188eu_init_phy_rf,
- 	.phy_iq_calibrate = rtl8188eu_phy_iq_calibrate,
-+	.config_channel = rtl8188eu_config_channel,
- 	.parse_rx_desc = rtl8xxxu_parse_rxdesc16,
- 	.usb_quirks = rtl8188e_usb_quirks,
- 	.writeN_block_size = 128,
diff --git a/package/kernel/mac80211/patches/653-0029-rtl8xxxu-Use-gen2-H2C-commands-for-8188eu.patch b/package/kernel/mac80211/patches/653-0029-rtl8xxxu-Use-gen2-H2C-commands-for-8188eu.patch
deleted file mode 100644
index cf3cde70b0..0000000000
--- a/package/kernel/mac80211/patches/653-0029-rtl8xxxu-Use-gen2-H2C-commands-for-8188eu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4ec1cada65cc1876277f5325b78019667f6e18c4 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 22 Jul 2016 11:44:12 -0400
-Subject: [PATCH] rtl8xxxu: Use gen2 H2C commands for 8188eu
-
-The 8188eu is a weird hybrid between the old gen1 and newer gen2
-APIs. It uses the newer API for H2C commands, hence use
-rtl8xxxu_gen2_update_rate_mask() and rtl8xxxu_gen2_report_connect().
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1128,6 +1128,8 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.config_channel = rtl8188eu_config_channel,
- 	.parse_rx_desc = rtl8xxxu_parse_rxdesc16,
- 	.usb_quirks = rtl8188e_usb_quirks,
-+	.update_rate_mask = rtl8xxxu_gen2_update_rate_mask,
-+	.report_connect = rtl8xxxu_gen2_report_connect,
- 	.writeN_block_size = 128,
- 	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc16),
- 	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
diff --git a/package/kernel/mac80211/patches/653-0030-rtl8xxxu-Initialize-GPIO-settings-for-8188eu.patch b/package/kernel/mac80211/patches/653-0030-rtl8xxxu-Initialize-GPIO-settings-for-8188eu.patch
deleted file mode 100644
index 2a5bb00b40..0000000000
--- a/package/kernel/mac80211/patches/653-0030-rtl8xxxu-Initialize-GPIO-settings-for-8188eu.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 061838d68d2c20acb5a57fbd92e3ed0ae906142e Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 22 Jul 2016 12:56:30 -0400
-Subject: [PATCH] rtl8xxxu: Initialize GPIO settings for 8188eu
-
-This matches what the vendor driver does, but is actually opposite of
-what it does for 8192eu.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 7 +++++++
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 1 +
- 2 files changed, 8 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -4210,6 +4210,13 @@ static int rtl8xxxu_init_device(struct i
- 		 * Reset USB mode switch setting
- 		 */
- 		rtl8xxxu_write8(priv, REG_ACLK_MON, 0x00);
-+	} else if (priv->rtl_chip == RTL8188E) {
-+		/*
-+		 * Init GPIO settings for 8188e
-+		 */
-+		val8 = rtl8xxxu_read8(priv, REG_GPIO_MUXCFG);
-+		val8 &= ~GPIO_MUXCFG_IO_SEL_ENBT;
-+		rtl8xxxu_write8(priv, REG_GPIO_MUXCFG, val8);
- 	}
- 
- 	rtl8723a_phy_lc_calibrate(priv);
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
-@@ -143,6 +143,7 @@
- #define REG_CAL_TIMER			0x003c
- #define REG_ACLK_MON			0x003e
- #define REG_GPIO_MUXCFG			0x0040
-+#define  GPIO_MUXCFG_IO_SEL_ENBT	BIT(5)
- #define REG_GPIO_IO_SEL			0x0042
- #define REG_MAC_PINMUX_CFG		0x0043
- #define REG_GPIO_PIN_CTRL		0x0044
diff --git a/package/kernel/mac80211/patches/653-0031-rtl8xxxu-Add-simple-rtl8188eu_rf_on-routine.patch b/package/kernel/mac80211/patches/653-0031-rtl8xxxu-Add-simple-rtl8188eu_rf_on-routine.patch
deleted file mode 100644
index 2803b9747a..0000000000
--- a/package/kernel/mac80211/patches/653-0031-rtl8xxxu-Add-simple-rtl8188eu_rf_on-routine.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2024562ed45d905bee00aea923c218c493c09d27 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 22 Jul 2016 13:10:02 -0400
-Subject: [PATCH] rtl8xxxu: Add simple rtl8188eu_rf_on() routine
-
-It is not obvious from the vendor driver if we need more than this.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1096,6 +1096,11 @@ exit:
- 	return ret;
- }
- 
-+static void rtl8188e_enable_rf(struct rtl8xxxu_priv *priv)
-+{
-+	rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00);
-+}
-+
- static void rtl8188e_usb_quirks(struct rtl8xxxu_priv *priv)
- {
- 	u16 val16;
-@@ -1127,6 +1132,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.phy_iq_calibrate = rtl8188eu_phy_iq_calibrate,
- 	.config_channel = rtl8188eu_config_channel,
- 	.parse_rx_desc = rtl8xxxu_parse_rxdesc16,
-+	.enable_rf = rtl8188e_enable_rf,
- 	.usb_quirks = rtl8188e_usb_quirks,
- 	.update_rate_mask = rtl8xxxu_gen2_update_rate_mask,
- 	.report_connect = rtl8xxxu_gen2_report_connect,
diff --git a/package/kernel/mac80211/patches/653-0032-rtl8xxxu-Implement-rtl8188e_disable_rf.patch b/package/kernel/mac80211/patches/653-0032-rtl8xxxu-Implement-rtl8188e_disable_rf.patch
deleted file mode 100644
index 1778b1636b..0000000000
--- a/package/kernel/mac80211/patches/653-0032-rtl8xxxu-Implement-rtl8188e_disable_rf.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f26f81e233f7a9b1bf21aa0de16a8db733c317ec Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 22 Jul 2016 13:17:36 -0400
-Subject: [PATCH] rtl8xxxu: Implement rtl8188e_disable_rf()
-
-This is partly guessware as there is no straight forward disable RF
-routine in the vendor driver.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1101,6 +1101,20 @@ static void rtl8188e_enable_rf(struct rt
- 	rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00);
- }
- 
-+static void rtl8188e_disable_rf(struct rtl8xxxu_priv *priv)
-+{
-+	u32 val32;
-+
-+	val32 = rtl8xxxu_read32(priv, REG_OFDM0_TRX_PATH_ENABLE);
-+	val32 &= ~OFDM_RF_PATH_TX_MASK;
-+	rtl8xxxu_write32(priv, REG_OFDM0_TRX_PATH_ENABLE, val32);
-+
-+	/* Power down RF module */
-+	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_AC, 0);
-+	if (priv->rf_paths == 2)
-+		rtl8xxxu_write_rfreg(priv, RF_B, RF6052_REG_AC, 0);
-+}
-+
- static void rtl8188e_usb_quirks(struct rtl8xxxu_priv *priv)
- {
- 	u16 val16;
-@@ -1133,6 +1147,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.config_channel = rtl8188eu_config_channel,
- 	.parse_rx_desc = rtl8xxxu_parse_rxdesc16,
- 	.enable_rf = rtl8188e_enable_rf,
-+	.disable_rf = rtl8188e_disable_rf,
- 	.usb_quirks = rtl8188e_usb_quirks,
- 	.update_rate_mask = rtl8xxxu_gen2_update_rate_mask,
- 	.report_connect = rtl8xxxu_gen2_report_connect,
diff --git a/package/kernel/mac80211/patches/653-0033-rtl8xxxu-Update-8188e-efuse-definition-for-power-val.patch b/package/kernel/mac80211/patches/653-0033-rtl8xxxu-Update-8188e-efuse-definition-for-power-val.patch
deleted file mode 100644
index c6d3d62351..0000000000
--- a/package/kernel/mac80211/patches/653-0033-rtl8xxxu-Update-8188e-efuse-definition-for-power-val.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 9067e08ea9ba380340388c3ad4ab85bd54ff4e8d Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 22 Jul 2016 16:46:11 -0400
-Subject: [PATCH] rtl8xxxu: Update 8188e efuse definition for power values
-
-The 8188e uses a similar layout as the 8192e, however it does not have
-values for path B. Update struct rtl8188eu_efuse to reflect this and
-copy over path A values for path B.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h      |  7 ++-----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c    | 19 +++++++++++--------
- 2 files changed, 13 insertions(+), 13 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -881,11 +881,8 @@ struct rtl8192eu_efuse {
- struct rtl8188eu_efuse {
- 	__le16 rtl_id;
- 	u8 res0[0x0e];
--	u8 cck_tx_power_index_A[3];	/* 0x10 */
--	u8 cck_tx_power_index_B[3];
--	u8 ht40_1s_tx_power_index_A[3];	/* 0x16 */
--	u8 ht40_1s_tx_power_index_B[3];
--	u8 res1[0x9c];
-+	struct rtl8192eu_efuse_tx_power tx_power_index_A;	/* 0x10 */
-+	u8 res1[0x7e];			/* 0x3a */
- 	u8 channel_plan;		/* 0xb8 */
- 	u8 xtal_k;
- 	u8 thermal_meter;
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -409,17 +409,20 @@ static int rtl8188eu_parse_efuse(struct
- 
- 	ether_addr_copy(priv->mac_addr, efuse->mac_addr);
- 
--	memcpy(priv->cck_tx_power_index_A, efuse->cck_tx_power_index_A,
--	       sizeof(efuse->cck_tx_power_index_A));
--	memcpy(priv->cck_tx_power_index_B, efuse->cck_tx_power_index_B,
--	       sizeof(efuse->cck_tx_power_index_B));
-+	memcpy(priv->cck_tx_power_index_A, efuse->tx_power_index_A.cck_base,
-+	       sizeof(efuse->tx_power_index_A.cck_base));
-+	/*
-+	 * Efuse is empty for path B, so copy in values from path A
-+	 */
-+	memcpy(priv->cck_tx_power_index_B, efuse->tx_power_index_A.cck_base,
-+	       sizeof(efuse->tx_power_index_A.cck_base));
- 
- 	memcpy(priv->ht40_1s_tx_power_index_A,
--	       priv->efuse_wifi.efuse8188eu.ht40_1s_tx_power_index_A,
--	       sizeof(priv->ht40_1s_tx_power_index_A));
-+	       efuse->tx_power_index_A.ht40_base,
-+	       sizeof(efuse->tx_power_index_A.ht40_base));
- 	memcpy(priv->ht40_1s_tx_power_index_B,
--	       priv->efuse_wifi.efuse8188eu.ht40_1s_tx_power_index_B,
--	       sizeof(priv->ht40_1s_tx_power_index_B));
-+	       efuse->tx_power_index_A.ht40_base,
-+	       sizeof(efuse->tx_power_index_A.ht40_base));
- 
- 	priv->xtalk = priv->efuse_wifi.efuse8188eu.xtal_k & 0x3f;
- 
diff --git a/package/kernel/mac80211/patches/653-0034-rtl8xxxu-Implement-rtl8188e_set_tx_power.patch b/package/kernel/mac80211/patches/653-0034-rtl8xxxu-Implement-rtl8188e_set_tx_power.patch
deleted file mode 100644
index 7cc0c1b76b..0000000000
--- a/package/kernel/mac80211/patches/653-0034-rtl8xxxu-Implement-rtl8188e_set_tx_power.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From cd4a93d1532b2f0ffe508f7fb5d464ec49634dcd Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 22 Jul 2016 13:55:24 -0400
-Subject: [PATCH] rtl8xxxu: Implement rtl8188e_set_tx_power()
-
-This matches the code used to set TX power on 8192eu, except it only
-handles path A.
-
-We should be able to consolidate this code.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 63 ++++++++++++++++++++++
- 1 file changed, 63 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -283,6 +283,68 @@ static struct rtl8xxxu_rfregval rtl8188e
- 	{0xff, 0xffffffff}
- };
- 
-+int rtl8xxxu_8188e_channel_to_group(int channel)
-+{
-+	int group;
-+
-+	if (channel < 3)
-+		group = 0;
-+	else if (channel < 6)
-+		group = 1;
-+	else if (channel < 9)
-+		group = 2;
-+	else if (channel < 12)
-+		group = 3;
-+	else if (channel < 14)
-+		group = 4;
-+	else
-+		group = 5;
-+
-+	return group;
-+}
-+
-+static void
-+rtl8188e_set_tx_power(struct rtl8xxxu_priv *priv, int channel, bool ht40)
-+{
-+	u32 val32, ofdm, mcs;
-+	u8 cck, ofdmbase, mcsbase;
-+	int group, tx_idx;
-+
-+	tx_idx = 0;
-+	group = rtl8xxxu_8188e_channel_to_group(channel);
-+
-+	cck = priv->cck_tx_power_index_A[group];
-+
-+	val32 = rtl8xxxu_read32(priv, REG_TX_AGC_A_CCK1_MCS32);
-+	val32 &= 0xffff00ff;
-+	val32 |= (cck << 8);
-+	rtl8xxxu_write32(priv, REG_TX_AGC_A_CCK1_MCS32, val32);
-+
-+	val32 = rtl8xxxu_read32(priv, REG_TX_AGC_B_CCK11_A_CCK2_11);
-+	val32 &= 0xff;
-+	val32 |= ((cck << 8) | (cck << 16) | (cck << 24));
-+	rtl8xxxu_write32(priv, REG_TX_AGC_B_CCK11_A_CCK2_11, val32);
-+
-+	ofdmbase = priv->ht40_1s_tx_power_index_A[group];
-+	ofdmbase += priv->ofdm_tx_power_diff[tx_idx].a;
-+	ofdm = ofdmbase | ofdmbase << 8 | ofdmbase << 16 | ofdmbase << 24;
-+
-+	rtl8xxxu_write32(priv, REG_TX_AGC_A_RATE18_06, ofdm);
-+	rtl8xxxu_write32(priv, REG_TX_AGC_A_RATE54_24, ofdm);
-+
-+	mcsbase = priv->ht40_1s_tx_power_index_A[group];
-+	if (ht40)
-+		mcsbase += priv->ht40_tx_power_diff[tx_idx++].a;
-+	else
-+		mcsbase += priv->ht20_tx_power_diff[tx_idx++].a;
-+	mcs = mcsbase | mcsbase << 8 | mcsbase << 16 | mcsbase << 24;
-+
-+	rtl8xxxu_write32(priv, REG_TX_AGC_A_MCS03_MCS00, mcs);
-+	rtl8xxxu_write32(priv, REG_TX_AGC_A_MCS07_MCS04, mcs);
-+	rtl8xxxu_write32(priv, REG_TX_AGC_A_MCS11_MCS08, mcs);
-+	rtl8xxxu_write32(priv, REG_TX_AGC_A_MCS15_MCS12, mcs);
-+}
-+
- void rtl8188eu_config_channel(struct ieee80211_hw *hw)
- {
- 	struct rtl8xxxu_priv *priv = hw->priv;
-@@ -1152,6 +1214,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.enable_rf = rtl8188e_enable_rf,
- 	.disable_rf = rtl8188e_disable_rf,
- 	.usb_quirks = rtl8188e_usb_quirks,
-+	.set_tx_power = rtl8188e_set_tx_power,
- 	.update_rate_mask = rtl8xxxu_gen2_update_rate_mask,
- 	.report_connect = rtl8xxxu_gen2_report_connect,
- 	.writeN_block_size = 128,
diff --git a/package/kernel/mac80211/patches/653-0035-rtl8xxxu-Implement-rtl8xxxu_fill_txdesc_v3-for-8188e.patch b/package/kernel/mac80211/patches/653-0035-rtl8xxxu-Implement-rtl8xxxu_fill_txdesc_v3-for-8188e.patch
deleted file mode 100644
index 7ceaccb3f8..0000000000
--- a/package/kernel/mac80211/patches/653-0035-rtl8xxxu-Implement-rtl8xxxu_fill_txdesc_v3-for-8188e.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-From 3c50918b180d091a49e412742a4f7aa1a89802b1 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 26 Jul 2016 14:01:14 -0400
-Subject: [PATCH] rtl8xxxu: Implement rtl8xxxu_fill_txdesc_v3() for 8188eu
-
-Getting closer but still no cigar.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   | 11 +++
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c |  1 +
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 78 ++++++++++++++++++++++
- 3 files changed, 90 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -510,6 +510,8 @@ struct rtl8xxxu_txdesc40 {
- #define TXDESC_AMPDU_DENSITY_SHIFT	20
- #define TXDESC40_BT_INT			BIT(23)
- #define TXDESC40_GID_SHIFT		24
-+#define TXDESC_ANTENNA_SELECT_A		BIT(24)
-+#define TXDESC_ANTENNA_SELECT_B		BIT(25)
- 
- /* Word 3 */
- #define TXDESC40_USE_DRIVER_RATE	BIT(8)
-@@ -554,6 +556,10 @@ struct rtl8xxxu_txdesc40 {
- 
- /* Word 6 */
- #define TXDESC_MAX_AGG_SHIFT		11
-+#define TXDESC_USB_TX_AGG_SHIT		24
-+
-+/* Word 7 */
-+#define TXDESC_ANTENNA_SELECT_C		BIT(29)
- 
- /* Word 8 */
- #define TXDESC40_HW_SEQ_ENABLE		BIT(15)
-@@ -1487,6 +1493,11 @@ void rtl8xxxu_fill_txdesc_v2(struct ieee
- 			     struct ieee80211_tx_info *tx_info,
- 			     struct rtl8xxxu_txdesc32 *tx_desc32, bool sgi,
- 			     bool short_preamble, bool ampdu_enable,
-+			     u32 rts_rate);
-+void rtl8xxxu_fill_txdesc_v3(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
-+			     struct ieee80211_tx_info *tx_info,
-+			     struct rtl8xxxu_txdesc32 *tx_desc32, bool sgi,
-+			     bool short_preamble, bool ampdu_enable,
- 			     u32 rts_rate);
- 
- extern struct rtl8xxxu_fileops rtl8188eu_fops;
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1217,6 +1217,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.set_tx_power = rtl8188e_set_tx_power,
- 	.update_rate_mask = rtl8xxxu_gen2_update_rate_mask,
- 	.report_connect = rtl8xxxu_gen2_report_connect,
-+	.fill_txdesc = rtl8xxxu_fill_txdesc_v3,
- 	.writeN_block_size = 128,
- 	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc16),
- 	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -4931,6 +4931,84 @@ rtl8xxxu_fill_txdesc_v2(struct ieee80211
- 	}
- }
- 
-+/*
-+ * Fill in v3 (gen1) specific TX descriptor bits.
-+ * This format is a hybrid between the v1 and v2 formats, only seen
-+ * on 8188eu devices so far.
-+ */
-+void
-+rtl8xxxu_fill_txdesc_v3(struct ieee80211_hw *hw, struct ieee80211_hdr *hdr,
-+			struct ieee80211_tx_info *tx_info,
-+			struct rtl8xxxu_txdesc32 *tx_desc, bool sgi,
-+			bool short_preamble, bool ampdu_enable, u32 rts_rate)
-+{
-+	struct ieee80211_rate *tx_rate = ieee80211_get_tx_rate(hw, tx_info);
-+	struct rtl8xxxu_priv *priv = hw->priv;
-+	struct device *dev = &priv->udev->dev;
-+	u32 rate;
-+	u16 rate_flags = tx_info->control.rates[0].flags;
-+	u16 seq_number;
-+
-+	if (rate_flags & IEEE80211_TX_RC_MCS &&
-+	    !ieee80211_is_mgmt(hdr->frame_control))
-+		rate = tx_info->control.rates[0].idx + DESC_RATE_MCS0;
-+	else
-+		rate = tx_rate->hw_value;
-+
-+	if (rtl8xxxu_debug & RTL8XXXU_DEBUG_TX)
-+		dev_info(dev, "%s: TX rate: %d, pkt size %d\n",
-+			 __func__, rate, cpu_to_le16(tx_desc->pkt_size));
-+
-+	seq_number = IEEE80211_SEQ_TO_SN(le16_to_cpu(hdr->seq_ctrl));
-+
-+	tx_desc->txdw5 = cpu_to_le32(rate);
-+
-+	/*
-+	 * Data/RTS rate FB limit
-+	 */
-+	if (ieee80211_is_data(hdr->frame_control))
-+		tx_desc->txdw5 |= cpu_to_le32(0x0001ff00);
-+
-+	tx_desc->txdw3 = cpu_to_le32((u32)seq_number << TXDESC32_SEQ_SHIFT);
-+
-+	if (ampdu_enable)
-+		tx_desc->txdw2 |= cpu_to_le32(TXDESC40_AGG_ENABLE);
-+	else
-+		tx_desc->txdw2 |= cpu_to_le32(TXDESC40_AGG_BREAK);
-+
-+	if (ieee80211_is_mgmt(hdr->frame_control)) {
-+		tx_desc->txdw5 = cpu_to_le32(rate);
-+		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_USE_DRIVER_RATE);
-+		tx_desc->txdw5 |= cpu_to_le32(6 << TXDESC32_RETRY_LIMIT_SHIFT);
-+		tx_desc->txdw5 |= cpu_to_le32(TXDESC32_RETRY_LIMIT_ENABLE);
-+	}
-+
-+	if (ieee80211_is_data_qos(hdr->frame_control))
-+		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_QOS);
-+
-+	if (short_preamble)
-+		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_SHORT_PREAMBLE);
-+
-+	if (sgi)
-+		tx_desc->txdw5 |= cpu_to_le32(TXDESC32_SHORT_GI);
-+
-+	/*
-+	 * rts_rate is zero if RTS/CTS or CTS to SELF are not enabled
-+	 */
-+	tx_desc->txdw4 |= cpu_to_le32(rts_rate << TXDESC32_RTS_RATE_SHIFT);
-+	if (rate_flags & IEEE80211_TX_RC_USE_RTS_CTS) {
-+		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_RTS_CTS_ENABLE);
-+		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
-+	} else if (rate_flags & IEEE80211_TX_RC_USE_CTS_PROTECT) {
-+		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_CTS_SELF_ENABLE);
-+		tx_desc->txdw4 |= cpu_to_le32(TXDESC32_HW_RTS_ENABLE);
-+	}
-+
-+	tx_desc->txdw2 |= cpu_to_le32(TXDESC_ANTENNA_SELECT_A |
-+				      TXDESC_ANTENNA_SELECT_B);
-+	tx_desc->txdw7 |= cpu_to_le32(TXDESC_ANTENNA_SELECT_C);
-+}
-+
- static void rtl8xxxu_tx(struct ieee80211_hw *hw,
- 			struct ieee80211_tx_control *control,
- 			struct sk_buff *skb)
diff --git a/package/kernel/mac80211/patches/653-0036-rtl8xxxu-Add-some-8188eu-registers-and-update-CCK0_A.patch b/package/kernel/mac80211/patches/653-0036-rtl8xxxu-Add-some-8188eu-registers-and-update-CCK0_A.patch
deleted file mode 100644
index e7f97a5b9d..0000000000
--- a/package/kernel/mac80211/patches/653-0036-rtl8xxxu-Add-some-8188eu-registers-and-update-CCK0_A.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From a9f5a167be625cf0cd157aa38f3635b2b1f0cc0f Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 29 Jul 2016 15:25:34 -0400
-Subject: [PATCH] rtl8xxxu: Add some 8188eu registers and update
- CCK0_AFE_SETTING bit defines
-
-CCK0_AFE_SETTING is particular, it has the notion of primary RX antenna
-and optional RX antenna. When configuring RX for single antenna, setup
-should use the same antenna for default and optional. For AB setup,
-use antenna A as default and B as optional.
-
-In addition add info for 8188eu IOL magic interface used to send
-firmware and register init files to the firmware.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h  | 30 ++++++++++++++++++++--
- 1 file changed, 28 insertions(+), 2 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
-@@ -378,6 +378,11 @@
- #define  PBP_PAGE_SIZE_512		0x3
- #define  PBP_PAGE_SIZE_1024		0x4
- 
-+/* 8188eu IOL magic */
-+#define REG_PKT_BUF_ACCESS_CTRL		0x0106
-+#define  PKT_BUF_ACCESS_CTRL_TX		0x69
-+#define  PKT_BUF_ACCESS_CTRL_RX		0xa5
-+
- #define REG_TRXDMA_CTRL			0x010c
- #define  TRXDMA_CTRL_RXDMA_AGG_EN	BIT(2)
- #define  TRXDMA_CTRL_VOQ_SHIFT		4
-@@ -449,6 +454,7 @@
- 
- #define REG_FIFOPAGE			0x0204
- #define REG_TDECTRL			0x0208
-+
- #define REG_TXDMA_OFFSET_CHK		0x020c
- #define  TXDMA_OFFSET_DROP_DATA_EN	BIT(9)
- #define REG_TXDMA_STATUS		0x0210
-@@ -938,6 +944,7 @@
- #define REG_FPGA1_RF_MODE		0x0900
- 
- #define REG_FPGA1_TX_INFO		0x090c
-+#define REG_ANT_MAPPING1		0x0914
- #define REG_DPDT_CTRL			0x092c	/* 8723BU */
- #define REG_RFE_CTRL_ANTA_SRC		0x0930	/* 8723BU */
- #define REG_RFE_PATH_SELECT		0x0940	/* 8723BU */
-@@ -949,9 +956,25 @@
- 
- #define REG_CCK0_AFE_SETTING		0x0a04
- #define  CCK0_AFE_RX_MASK		0x0f000000
--#define  CCK0_AFE_RX_ANT_AB		BIT(24)
-+#define  CCK0_AFE_TX_MASK		0xf0000000
- #define  CCK0_AFE_RX_ANT_A		0
--#define  CCK0_AFE_RX_ANT_B		(BIT(24) | BIT(26))
-+#define  CCK0_AFE_RX_ANT_B		BIT(26)
-+#define  CCK0_AFE_RX_ANT_C		BIT(27)
-+#define  CCK0_AFE_RX_ANT_D		(BIT(26) | BIT(27))
-+#define  CCK0_AFE_RX_ANT_OPTION_A	0
-+#define  CCK0_AFE_RX_ANT_OPTION_B	BIT(24)
-+#define  CCK0_AFE_RX_ANT_OPTION_C	BIT(25)
-+#define  CCK0_AFE_RX_ANT_OPTION_D	(BIT(24) | BIT(25))
-+#define  CCK0_AFE_TX_ANT_A		BIT(31)
-+#define  CCK0_AFE_TX_ANT_B		BIT(30)
-+
-+#define REG_CCK_ANTDIV_PARA2		0x0a04
-+#define REG_BB_POWER_SAVE4		0x0a74
-+
-+/* 8188eu */
-+#define REG_LNA_SWITCH			0x0b2c
-+#define  LNA_SWITCH_DISABLE_CSCG	BIT(22)
-+#define  LNA_SWITCH_OUTPUT_CG		BIT(31)
- 
- #define REG_CONFIG_ANT_A		0x0b68
- #define REG_CONFIG_ANT_B		0x0b6c
-@@ -1004,6 +1027,9 @@
- 
- #define REG_OFDM0_RX_IQ_EXT_ANTA	0x0ca0
- 
-+/* 8188eu */
-+#define REG_ANTDIV_PARA1		0x0ca4
-+
- /* 8723bu */
- #define REG_OFDM0_TX_PSDO_NOISE_WEIGHT	0x0ce4
- 
diff --git a/package/kernel/mac80211/patches/653-0037-rtl8xxxu-Improve-register-description-for-REG_FPGA1_.patch b/package/kernel/mac80211/patches/653-0037-rtl8xxxu-Improve-register-description-for-REG_FPGA1_.patch
deleted file mode 100644
index bb940db3c8..0000000000
--- a/package/kernel/mac80211/patches/653-0037-rtl8xxxu-Improve-register-description-for-REG_FPGA1_.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5731f8a7485120836c42e0dfae61644588ffd119 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 29 Jul 2016 15:57:19 -0400
-Subject: [PATCH] rtl8xxxu: Improve register description for REG_FPGA1_TX_INFO
-
-This is based on Hal_SetAntenna() from the 8188eu driver
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
-@@ -944,6 +944,15 @@
- #define REG_FPGA1_RF_MODE		0x0900
- 
- #define REG_FPGA1_TX_INFO		0x090c
-+#define  FPGA1_TX_ANT_MASK		0x0000000f
-+#define  FPGA1_TX_ANT_L_MASK		0x000000f0
-+#define  FPGA1_TX_ANT_NON_HT_MASK	0x00000f00
-+#define  FPGA1_TX_ANT_HT1_MASK		0x0000f000
-+#define  FPGA1_TX_ANT_HT2_MASK		0x000f0000
-+#define  FPGA1_TX_ANT_HT_S1_MASK	0x00f00000
-+#define  FPGA1_TX_ANT_NON_HT_S1_MASK	0x0f000000
-+#define  FPGA1_TX_OFDM_TXSC_MASK	0x30000000
-+
- #define REG_ANT_MAPPING1		0x0914
- #define REG_DPDT_CTRL			0x092c	/* 8723BU */
- #define REG_RFE_CTRL_ANTA_SRC		0x0930	/* 8723BU */
diff --git a/package/kernel/mac80211/patches/653-0038-rtl8xxxu-properly-detect-RTL8188EU-devices.patch b/package/kernel/mac80211/patches/653-0038-rtl8xxxu-properly-detect-RTL8188EU-devices.patch
deleted file mode 100644
index ed3a27be40..0000000000
--- a/package/kernel/mac80211/patches/653-0038-rtl8xxxu-properly-detect-RTL8188EU-devices.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 36c071e30dc5759be3e53ac93459c24fb64d41c3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
-Date: Fri, 29 Jul 2016 18:22:37 +0200
-Subject: [PATCH] rtl8xxxu: properly detect RTL8188EU devices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The assumption that all RTL8188EU have chip cut >= C is wrong.
-However, RTL8188EU devices can be easily differentiated from RTL8188CU devices
-relying on TX report capbility.
-
-Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -1683,7 +1683,7 @@ static int rtl8xxxu_identify_chip(struct
- 		}
- 		priv->has_wifi = 1;
- 	} else {
--		if (priv->chip_cut >= 2) {
-+		if (priv->fops->has_tx_report) {
- 			sprintf(priv->chip_name, "8188EU");
- 			priv->rf_paths = 1;
- 			priv->rx_paths = 1;
diff --git a/package/kernel/mac80211/patches/653-0039-rtl8xxxu-Implement-8188eu-specific-8051-reset-functi.patch b/package/kernel/mac80211/patches/653-0039-rtl8xxxu-Implement-8188eu-specific-8051-reset-functi.patch
deleted file mode 100644
index 65bab0deee..0000000000
--- a/package/kernel/mac80211/patches/653-0039-rtl8xxxu-Implement-8188eu-specific-8051-reset-functi.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 660a287a0a32ce9f8be9b3ad625c597ad1ed38a2 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 10 Aug 2016 15:40:30 -0400
-Subject: [PATCH] rtl8xxxu: Implement 8188eu specific 8051 reset function
-
-The 8188eu doesn't seem to require the additional hacks used on some
-other chips.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 14 +++++++++++++-
- 1 file changed, 13 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -505,6 +505,18 @@ static int rtl8188eu_parse_efuse(struct
- 	return 0;
- }
- 
-+void rtl8188eu_reset_8051(struct rtl8xxxu_priv *priv)
-+{
-+	u16 sys_func;
-+
-+	sys_func = rtl8xxxu_read16(priv, REG_SYS_FUNC);
-+	sys_func &= ~SYS_FUNC_CPU_ENABLE;
-+	rtl8xxxu_write16(priv, REG_SYS_FUNC, sys_func);
-+
-+	sys_func |= SYS_FUNC_CPU_ENABLE;
-+	rtl8xxxu_write16(priv, REG_SYS_FUNC, sys_func);
-+}
-+
- static int rtl8188eu_load_firmware(struct rtl8xxxu_priv *priv)
- {
- 	char *fw_name;
-@@ -1204,7 +1216,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.load_firmware = rtl8188eu_load_firmware,
- 	.power_on = rtl8188eu_power_on,
- 	.power_off = rtl8xxxu_power_off,
--	.reset_8051 = rtl8xxxu_reset_8051,
-+	.reset_8051 = rtl8188eu_reset_8051,
- 	.llt_init = rtl8xxxu_auto_llt_table,
- 	.init_phy_bb = rtl8188eu_init_phy_bb,
- 	.init_phy_rf = rtl8188eu_init_phy_rf,
diff --git a/package/kernel/mac80211/patches/653-0040-rtl8xxxu-Disable-packet-DMA-aggregation-on-8188eu.patch b/package/kernel/mac80211/patches/653-0040-rtl8xxxu-Disable-packet-DMA-aggregation-on-8188eu.patch
deleted file mode 100644
index ada4f2df52..0000000000
--- a/package/kernel/mac80211/patches/653-0040-rtl8xxxu-Disable-packet-DMA-aggregation-on-8188eu.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From f435337a2fc97c97476d833700e4a8fd17d99007 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 10 Aug 2016 15:41:13 -0400
-Subject: [PATCH] rtl8xxxu: Disable packet DMA aggregation on 8188eu
-
-For now disable packet DMA aggregation on the 8188eu, rather then
-risking the feature being left on by the init tables.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -461,6 +461,19 @@ void rtl8188eu_config_channel(struct iee
- 	}
- }
- 
-+void rtl8188eu_init_aggregation(struct rtl8xxxu_priv *priv)
-+{
-+	u8 agg_ctrl, usb_spec;
-+
-+	usb_spec = rtl8xxxu_read8(priv, REG_USB_SPECIAL_OPTION);
-+	usb_spec &= ~USB_SPEC_USB_AGG_ENABLE;
-+	rtl8xxxu_write8(priv, REG_USB_SPECIAL_OPTION, usb_spec);
-+
-+	agg_ctrl = rtl8xxxu_read8(priv, REG_TRXDMA_CTRL);
-+	agg_ctrl &= ~TRXDMA_CTRL_RXDMA_AGG_EN;
-+	rtl8xxxu_write8(priv, REG_TRXDMA_CTRL, agg_ctrl);
-+}
-+
- static int rtl8188eu_parse_efuse(struct rtl8xxxu_priv *priv)
- {
- 	struct rtl8188eu_efuse *efuse = &priv->efuse_wifi.efuse8188eu;
-@@ -1223,6 +1236,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.phy_iq_calibrate = rtl8188eu_phy_iq_calibrate,
- 	.config_channel = rtl8188eu_config_channel,
- 	.parse_rx_desc = rtl8xxxu_parse_rxdesc16,
-+	.init_aggregation = rtl8188eu_init_aggregation,
- 	.enable_rf = rtl8188e_enable_rf,
- 	.disable_rf = rtl8188e_disable_rf,
- 	.usb_quirks = rtl8188e_usb_quirks,
diff --git a/package/kernel/mac80211/patches/653-0041-rtl8xxxu-8188eu-set-REG_OFDM0_XA_AGC_CORE1-to-match-.patch b/package/kernel/mac80211/patches/653-0041-rtl8xxxu-8188eu-set-REG_OFDM0_XA_AGC_CORE1-to-match-.patch
deleted file mode 100644
index e11260eb8a..0000000000
--- a/package/kernel/mac80211/patches/653-0041-rtl8xxxu-8188eu-set-REG_OFDM0_XA_AGC_CORE1-to-match-.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 4aecb21cdc491804c936a71e98192ba144757ea3 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 10 Aug 2016 16:06:37 -0400
-Subject: [PATCH] rtl8xxxu: 8188eu set REG_OFDM0_XA_AGC_CORE1 to match vendor
- driver
-
-We have no description of this register, so not sure why this differs
-from say 8723au.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -5945,7 +5945,10 @@ exit:
- 	rtl8xxxu_write16(priv, REG_RXFLTMAP2, 0xffff);
- 	rtl8xxxu_write16(priv, REG_RXFLTMAP0, 0xffff);
- 
--	rtl8xxxu_write32(priv, REG_OFDM0_XA_AGC_CORE1, 0x6954341e);
-+	if (priv->rtl_chip == RTL8188E)
-+		rtl8xxxu_write32(priv, REG_OFDM0_XA_AGC_CORE1, 0x6955341e);
-+	else
-+		rtl8xxxu_write32(priv, REG_OFDM0_XA_AGC_CORE1, 0x6954341e);
- 
- 	return ret;
- 
diff --git a/package/kernel/mac80211/patches/653-0042-rtl8xxxu-Fix-rtl8188eu-connection-fail.patch b/package/kernel/mac80211/patches/653-0042-rtl8xxxu-Fix-rtl8188eu-connection-fail.patch
deleted file mode 100644
index 1a39cc461a..0000000000
--- a/package/kernel/mac80211/patches/653-0042-rtl8xxxu-Fix-rtl8188eu-connection-fail.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ef6a147ea381e76fa02358aa5b65816121d57a4c Mon Sep 17 00:00:00 2001
-From: Taehee Yoo <ap420073@gmail.com>
-Date: Sun, 21 Aug 2016 20:38:22 +0900
-Subject: [PATCH] rtl8xxxu: Fix rtl8188eu connection fail
-
-rtl8188eu vendor driver's LLT init routine is similar
-rtl8xxxu_init_llt_table() than rtl8xxxu_auto_llt_table().
-
-So now, rtl8188eu can connect to AP.
-
-Signed-off-by: Taehee Yoo <ap420073@gmail.com>
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1230,7 +1230,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.power_on = rtl8188eu_power_on,
- 	.power_off = rtl8xxxu_power_off,
- 	.reset_8051 = rtl8188eu_reset_8051,
--	.llt_init = rtl8xxxu_auto_llt_table,
-+	.llt_init = rtl8xxxu_init_llt_table,
- 	.init_phy_bb = rtl8188eu_init_phy_bb,
- 	.init_phy_rf = rtl8188eu_init_phy_rf,
- 	.phy_iq_calibrate = rtl8188eu_phy_iq_calibrate,
diff --git a/package/kernel/mac80211/patches/653-0043-rtl8xxxu-Do-not-set-auto-rate-fallback-on-8188eu.patch b/package/kernel/mac80211/patches/653-0043-rtl8xxxu-Do-not-set-auto-rate-fallback-on-8188eu.patch
deleted file mode 100644
index 1047625de7..0000000000
--- a/package/kernel/mac80211/patches/653-0043-rtl8xxxu-Do-not-set-auto-rate-fallback-on-8188eu.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 738832d9e91098f5b3ddb4e71fe8e666575c6bdb Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 24 Aug 2016 13:54:00 -0400
-Subject: [PATCH] rtl8xxxu: Do not set auto rate fallback on 8188eu
-
-Introduce a fileops flag to indicate whether the device has this
-feature.
-
-Reported-by: Taehee Yoo <ap420073@gmail.com>
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h       |  1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c |  1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c |  1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c |  1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c |  1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 15 ++++++++++-----
- 6 files changed, 15 insertions(+), 5 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -1398,6 +1398,7 @@ struct rtl8xxxu_fileops {
- 	u8 has_s0s1:1;
- 	u8 has_tx_report:1;
- 	u8 gen2_thermal_meter:1;
-+	u8 has_darfrc:1;
- 	u32 adda_1t_init;
- 	u32 adda_1t_path_on;
- 	u32 adda_2t_path_on_a;
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c
-@@ -572,6 +572,7 @@ struct rtl8xxxu_fileops rtl8192cu_fops =
- 	.rx_agg_buf_size = 16000,
- 	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
- 	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc16),
-+	.has_darfrc = 1,
- 	.adda_1t_init = 0x0b1b25a0,
- 	.adda_1t_path_on = 0x0bdb25a0,
- 	.adda_2t_path_on_a = 0x04db25a4,
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
-@@ -1658,6 +1658,7 @@ struct rtl8xxxu_fileops rtl8192eu_fops =
- 	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24),
- 	.has_s0s1 = 0,
- 	.gen2_thermal_meter = 1,
-+	.has_darfrc = 1,
- 	.adda_1t_init = 0x0fc01616,
- 	.adda_1t_path_on = 0x0fc01616,
- 	.adda_2t_path_on_a = 0x0fc01616,
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c
-@@ -389,6 +389,7 @@ struct rtl8xxxu_fileops rtl8723au_fops =
- 	.rx_agg_buf_size = 16000,
- 	.tx_desc_size = sizeof(struct rtl8xxxu_txdesc32),
- 	.rx_desc_size = sizeof(struct rtl8xxxu_rxdesc16),
-+	.has_darfrc = 1,
- 	.adda_1t_init = 0x0b1b25a0,
- 	.adda_1t_path_on = 0x0bdb25a0,
- 	.adda_2t_path_on_a = 0x04db25a4,
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c
-@@ -1673,6 +1673,7 @@ struct rtl8xxxu_fileops rtl8723bu_fops =
- 	.has_s0s1 = 1,
- 	.has_tx_report = 1,
- 	.gen2_thermal_meter = 1,
-+	.has_darfrc = 1,
- 	.adda_1t_init = 0x01c00014,
- 	.adda_1t_path_on = 0x01c00014,
- 	.adda_2t_path_on_a = 0x01c00014,
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -4105,11 +4105,16 @@ static int rtl8xxxu_init_device(struct i
- 	rtl8xxxu_write32(priv, REG_EDCA_VI_PARAM, 0x005ea324);
- 	rtl8xxxu_write32(priv, REG_EDCA_VO_PARAM, 0x002fa226);
- 
--	/* Set data auto rate fallback retry count */
--	rtl8xxxu_write32(priv, REG_DARFRC, 0x00000000);
--	rtl8xxxu_write32(priv, REG_DARFRC + 4, 0x10080404);
--	rtl8xxxu_write32(priv, REG_RARFRC, 0x04030201);
--	rtl8xxxu_write32(priv, REG_RARFRC + 4, 0x08070605);
-+	/*
-+	 * Set data auto rate fallback retry count.
-+	 * Notably the 8188eu doesn't seem to use this
-+	 */
-+	if (fops->has_darfrc) {
-+		rtl8xxxu_write32(priv, REG_DARFRC, 0x00000000);
-+		rtl8xxxu_write32(priv, REG_DARFRC + 4, 0x10080404);
-+		rtl8xxxu_write32(priv, REG_RARFRC, 0x04030201);
-+		rtl8xxxu_write32(priv, REG_RARFRC + 4, 0x08070605);
-+	}
- 
- 	val8 = rtl8xxxu_read8(priv, REG_FWHW_TXQ_CTRL);
- 	val8 |= FWHW_TXQ_CTRL_AMPDU_RETRY;
diff --git a/package/kernel/mac80211/patches/653-0044-rtl8xxxu-Enable-8188eu-driver.patch b/package/kernel/mac80211/patches/653-0044-rtl8xxxu-Enable-8188eu-driver.patch
deleted file mode 100644
index 49aba984b5..0000000000
--- a/package/kernel/mac80211/patches/653-0044-rtl8xxxu-Enable-8188eu-driver.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b7aed472c6639e2a523d0ef90dba61246d7bd9b4 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 25 Jul 2016 12:32:02 -0400
-Subject: [PATCH] rtl8xxxu: Enable 8188eu driver
-
-This enables the 8188eu driver - this should work by now.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 1 -
- 1 file changed, 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -539,7 +539,6 @@ static int rtl8188eu_load_firmware(struc
- 
- 	ret = rtl8xxxu_load_firmware(priv, fw_name);
- 
--	return -EINVAL;
- 	return ret;
- }
- 
diff --git a/package/kernel/mac80211/patches/653-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch b/package/kernel/mac80211/patches/653-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch
deleted file mode 100644
index be5f72ff4d..0000000000
--- a/package/kernel/mac80211/patches/653-0045-rtl8xxxu-Add-rtl8188etv-to-USB-device-list.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 13d8b1bb62307242615f1bebd67d165a91b9f7d5 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 26 Aug 2016 10:28:45 -0400
-Subject: [PATCH] rtl8xxxu: Add rtl8188etv to USB device list
-
-Hans de Goede reported this works for him with two different tablets.
-
-Reported-by: Hans de Goede <hdegoede@redhat.com>
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -6326,6 +6326,9 @@ static const struct usb_device_id dev_ta
- #ifdef CPTCFG_RTL8XXXU_UNTESTED
- {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8179, 0xff, 0xff, 0xff),
- 	.driver_info = (unsigned long)&rtl8188eu_fops},
-+/* Tested by Hans de Goede - rtl8188etv */
-+{USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x0179, 0xff, 0xff, 0xff),
-+	.driver_info = (unsigned long)&rtl8188eu_fops},
- /* Still supported by rtlwifi */
- {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8176, 0xff, 0xff, 0xff),
- 	.driver_info = (unsigned long)&rtl8192cu_fops},
diff --git a/package/kernel/mac80211/patches/653-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch b/package/kernel/mac80211/patches/653-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch
deleted file mode 100644
index b4898018f8..0000000000
--- a/package/kernel/mac80211/patches/653-0046-rtl8xxxu-Add-sitecom-dongle-to-USB-device-list.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e7be61a187c902ae296acf70981a899e9e34a885 Mon Sep 17 00:00:00 2001
-From: Andrea Merello <andrea.merello@gmail.com>
-Date: Fri, 26 Aug 2016 19:18:17 +0200
-Subject: [PATCH] rtl8xxxu: Add sitecom dongle to USB device list
-
-Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -6329,6 +6329,9 @@ static const struct usb_device_id dev_ta
- /* Tested by Hans de Goede - rtl8188etv */
- {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x0179, 0xff, 0xff, 0xff),
- 	.driver_info = (unsigned long)&rtl8188eu_fops},
-+/* Sitecom rtl8188eus */
-+{USB_DEVICE_AND_INTERFACE_INFO(0x0df6, 0x0076, 0xff, 0xff, 0xff),
-+	.driver_info = (unsigned long)&rtl8188eu_fops},
- /* Still supported by rtlwifi */
- {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8176, 0xff, 0xff, 0xff),
- 	.driver_info = (unsigned long)&rtl8192cu_fops},
diff --git a/package/kernel/mac80211/patches/653-0047-rtl8xxxu-Implement-rtl8188eu_active_to_emu.patch b/package/kernel/mac80211/patches/653-0047-rtl8xxxu-Implement-rtl8188eu_active_to_emu.patch
deleted file mode 100644
index 853f2f9ec4..0000000000
--- a/package/kernel/mac80211/patches/653-0047-rtl8xxxu-Implement-rtl8188eu_active_to_emu.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From b3edeceb7c8c3b0eb70b26e3237afa5086afe8ed Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 26 Aug 2016 15:16:32 -0400
-Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_active_to_emu()
-
-Per the vendor driver's sequence table, this seems to be the correct
-way to disable RF on the 8188eu, even if the driver doesn't actually
-call the sequence by itself.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 38 ++++++++++++++++++++++
- 1 file changed, 38 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1155,6 +1155,42 @@ exit:
- 	return ret;
- }
- 
-+static int rtl8188eu_active_to_emu(struct rtl8xxxu_priv *priv)
-+{
-+	u8 val8;
-+	int count, ret = 0;
-+
-+	/* Turn off RF */
-+	rtl8xxxu_write8(priv, REG_RF_CTRL, 0);
-+
-+	/* LDO Sleep mode */
-+	val8 = rtl8xxxu_read8(priv, REG_LPLDO_CTRL);
-+	val8 |= BIT(4);
-+	rtl8xxxu_write8(priv, REG_LPLDO_CTRL, val8);
-+
-+	/* 0x0005[1] = 1 turn off MAC by HW state machine*/
-+	val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 1);
-+	val8 |= BIT(1);
-+	rtl8xxxu_write8(priv, REG_APS_FSMCO + 1, val8);
-+
-+	for (count = RTL8XXXU_MAX_REG_POLL; count; count--) {
-+		val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 1);
-+		if ((val8 & BIT(1)) == 0)
-+			break;
-+		udelay(10);
-+	}
-+
-+	if (!count) {
-+		dev_warn(&priv->udev->dev, "%s: Disabling MAC timed out\n",
-+			 __func__);
-+		ret = -EBUSY;
-+		goto exit;
-+	}
-+
-+exit:
-+	return ret;
-+}
-+
- static int rtl8188eu_power_on(struct rtl8xxxu_priv *priv)
- {
- 	u16 val16;
-@@ -1202,6 +1238,8 @@ static void rtl8188e_disable_rf(struct r
- 	rtl8xxxu_write_rfreg(priv, RF_A, RF6052_REG_AC, 0);
- 	if (priv->rf_paths == 2)
- 		rtl8xxxu_write_rfreg(priv, RF_B, RF6052_REG_AC, 0);
-+
-+	rtl8188eu_active_to_emu(priv);
- }
- 
- static void rtl8188e_usb_quirks(struct rtl8xxxu_priv *priv)
diff --git a/package/kernel/mac80211/patches/653-0048-rtl8xxxu-Implement-rtl8188eu_power_off.patch b/package/kernel/mac80211/patches/653-0048-rtl8xxxu-Implement-rtl8188eu_power_off.patch
deleted file mode 100644
index 69b0f02852..0000000000
--- a/package/kernel/mac80211/patches/653-0048-rtl8xxxu-Implement-rtl8188eu_power_off.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From 34e65b6f310234cf3e3629bd3d896a4f84df71f4 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Fri, 26 Aug 2016 16:09:00 -0400
-Subject: [PATCH] rtl8xxxu: Implement rtl8188eu_power_off()
-
-This makes the driver match the poweroff sequence of the vendor driver
-and allows the firmware to reload correctly upon rmmod/insmod.
-However the device still doesn't receive data upon reloading.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 136 ++++++++++++++++++++-
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h  |   2 +
- 2 files changed, 137 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1191,6 +1191,71 @@ exit:
- 	return ret;
- }
- 
-+static int rtl8188eu_emu_to_disabled(struct rtl8xxxu_priv *priv)
-+{
-+	u8 val8;
-+
-+	/* 0x04[12:11] = 01 enable WL suspend */
-+	val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 2);
-+	val8 &= ~BIT(0);
-+	rtl8xxxu_write8(priv, REG_APS_FSMCO + 2, val8);
-+
-+	val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 1);
-+	val8 |= BIT(7);
-+	rtl8xxxu_write8(priv, REG_APS_FSMCO + 1, val8);
-+
-+	return 0;
-+}
-+
-+static int rtl8188eu_active_to_lps(struct rtl8xxxu_priv *priv)
-+{
-+	struct device *dev = &priv->udev->dev;
-+	u8 val8;
-+	u16 val16;
-+	u32 val32;
-+	int retry, retval;
-+
-+	rtl8xxxu_write8(priv, REG_TXPAUSE, 0x7f);
-+
-+	retry = 100;
-+	retval = -EBUSY;
-+	/*
-+	 * Poll 32 bit wide 0x05f8 for 0x00000000 to ensure no TX is pending.
-+	 */
-+	do {
-+		val32 = rtl8xxxu_read32(priv, 0x05f8);
-+		if (!val32) {
-+			retval = 0;
-+			break;
-+		}
-+	} while (retry--);
-+
-+	if (!retry) {
-+		dev_warn(dev, "Failed to flush TX queue\n");
-+		retval = -EBUSY;
-+		goto out;
-+	}
-+
-+	/* Disable CCK and OFDM, clock gated */
-+	val8 = rtl8xxxu_read8(priv, REG_SYS_FUNC);
-+	val8 &= ~SYS_FUNC_BBRSTB;
-+	rtl8xxxu_write8(priv, REG_SYS_FUNC, val8);
-+
-+	udelay(2);
-+
-+	/* Reset MAC TRX */
-+	val16 = rtl8xxxu_read16(priv, REG_CR);
-+	val16 &= ~(CR_MAC_TX_ENABLE | CR_MAC_RX_ENABLE | CR_SECURITY_ENABLE);
-+	rtl8xxxu_write16(priv, REG_CR, val16);
-+
-+	val8 = rtl8xxxu_read8(priv, REG_DUAL_TSF_RST);
-+	val8 |= DUAL_TSF_TX_OK;
-+	rtl8xxxu_write8(priv, REG_DUAL_TSF_RST, val8);
-+
-+out:
-+	return retval;
-+}
-+
- static int rtl8188eu_power_on(struct rtl8xxxu_priv *priv)
- {
- 	u16 val16;
-@@ -1221,6 +1286,75 @@ exit:
- 	return ret;
- }
- 
-+void rtl8188eu_power_off(struct rtl8xxxu_priv *priv)
-+{
-+	u8 val8;
-+	u16 val16;
-+
-+	rtl8xxxu_flush_fifo(priv);
-+
-+	val8 = rtl8xxxu_read8(priv, REG_TX_REPORT_CTRL);
-+	val8 &= ~TX_REPORT_CTRL_TIMER_ENABLE;
-+	rtl8xxxu_write8(priv, REG_TX_REPORT_CTRL, val8);
-+
-+	/* Turn off RF */
-+	rtl8xxxu_write8(priv, REG_RF_CTRL, 0x00);
-+
-+	rtl8188eu_active_to_lps(priv);
-+
-+	/* Reset Firmware if running in RAM */
-+	if (rtl8xxxu_read8(priv, REG_MCU_FW_DL) & MCU_FW_RAM_SEL)
-+		rtl8xxxu_firmware_self_reset(priv);
-+
-+	/* Reset MCU */
-+	val16 = rtl8xxxu_read16(priv, REG_SYS_FUNC);
-+	val16 &= ~SYS_FUNC_CPU_ENABLE;
-+	rtl8xxxu_write16(priv, REG_SYS_FUNC, val16);
-+
-+	/* Reset MCU ready status */
-+	rtl8xxxu_write8(priv, REG_MCU_FW_DL, 0x00);
-+
-+	/* 32K_CTRL looks to be very 8188e specific */
-+	val8 = rtl8xxxu_read8(priv, REG_32K_CTRL);
-+	val8 &= ~BIT(0);
-+	rtl8xxxu_write8(priv, REG_32K_CTRL, val8);
-+
-+	rtl8188eu_active_to_emu(priv);
-+	rtl8188eu_emu_to_disabled(priv);
-+
-+	/* Reset MCU IO Wrapper */
-+	val8 = rtl8xxxu_read8(priv, REG_RSV_CTRL + 1);
-+	val8 &= ~BIT(3);
-+	rtl8xxxu_write8(priv, REG_RSV_CTRL + 1, val8);
-+
-+	val8 = rtl8xxxu_read8(priv, REG_RSV_CTRL + 1);
-+	val8 |= BIT(3);
-+	rtl8xxxu_write8(priv, REG_RSV_CTRL + 1, val8);
-+
-+	/* Vendor driver refers to GPIO_IN */
-+	val8 = rtl8xxxu_read8(priv, REG_GPIO_PIN_CTRL);
-+	/* Vendor driver refers to GPIO_OUT */
-+	rtl8xxxu_write8(priv, REG_GPIO_PIN_CTRL + 1, val8);
-+	rtl8xxxu_write8(priv, REG_GPIO_PIN_CTRL + 2, 0xff);
-+
-+	val8 = rtl8xxxu_read8(priv, REG_GPIO_IO_SEL);
-+	rtl8xxxu_write8(priv, REG_GPIO_IO_SEL + 1, val8 << 4);
-+	val8 = rtl8xxxu_read8(priv, REG_GPIO_IO_SEL + 1);
-+	rtl8xxxu_write8(priv, REG_GPIO_IO_SEL + 1, val8 | 0x0f);
-+
-+	/*
-+	 * Set LNA, TRSW, EX_PA Pin to output mode
-+	 * Referred to as REG_BB_PAD_CTRL in 8188eu vendor driver
-+	 */
-+	rtl8xxxu_write32(priv, REG_PAD_CTRL1, 0x00080808);
-+
-+	rtl8xxxu_write8(priv, REG_RSV_CTRL, 0x00);
-+
-+	val16 = rtl8xxxu_read16(priv, REG_APS_FSMCO);
-+	val16 |= APS_FSMCO_ENABLE_POWERDOWN | APS_FSMCO_HW_POWERDOWN;
-+	rtl8xxxu_write16(priv, REG_APS_FSMCO, val16);
-+}
-+
- static void rtl8188e_enable_rf(struct rtl8xxxu_priv *priv)
- {
- 	rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00);
-@@ -1265,7 +1399,7 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.parse_efuse = rtl8188eu_parse_efuse,
- 	.load_firmware = rtl8188eu_load_firmware,
- 	.power_on = rtl8188eu_power_on,
--	.power_off = rtl8xxxu_power_off,
-+	.power_off = rtl8188eu_power_off,
- 	.reset_8051 = rtl8188eu_reset_8051,
- 	.llt_init = rtl8xxxu_init_llt_table,
- 	.init_phy_bb = rtl8188eu_init_phy_bb,
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
-@@ -418,6 +418,8 @@
- #define REG_MBIST_START			0x0174
- #define REG_MBIST_DONE			0x0178
- #define REG_MBIST_FAIL			0x017c
-+/* 8188EU */
-+#define REG_32K_CTRL			0x0194
- #define REG_C2HEVT_MSG_NORMAL		0x01a0
- /* 8192EU/8723BU/8812 */
- #define REG_C2HEVT_CMD_ID_8723B		0x01ae
diff --git a/package/kernel/mac80211/patches/653-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch b/package/kernel/mac80211/patches/653-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch
deleted file mode 100644
index 669fca6706..0000000000
--- a/package/kernel/mac80211/patches/653-0049-rtl8xxxu-Add-rtl8188eu-USB-ID-for-D-Link-USB-GO-N150.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5cd16e6a4660c07f01753e460eafdb805e71b9e9 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 29 Aug 2016 12:55:37 -0400
-Subject: [PATCH] rtl8xxxu: Add rtl8188eu USB ID for D-Link USB-GO-N150
-
-Received one in the mail yesterday, seems to work like all the other
-8188eu dongles I have.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -6332,6 +6332,9 @@ static const struct usb_device_id dev_ta
- /* Sitecom rtl8188eus */
- {USB_DEVICE_AND_INTERFACE_INFO(0x0df6, 0x0076, 0xff, 0xff, 0xff),
- 	.driver_info = (unsigned long)&rtl8188eu_fops},
-+/* D-Link USB-GO-N150 */
-+{USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3311, 0xff, 0xff, 0xff),
-+	.driver_info = (unsigned long)&rtl8188eu_fops},
- /* Still supported by rtlwifi */
- {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8176, 0xff, 0xff, 0xff),
- 	.driver_info = (unsigned long)&rtl8192cu_fops},
diff --git a/package/kernel/mac80211/patches/653-0050-rtl8xxxu-Clear-SYS_FUNC_UPLL-during-power-up-on-8188.patch b/package/kernel/mac80211/patches/653-0050-rtl8xxxu-Clear-SYS_FUNC_UPLL-during-power-up-on-8188.patch
deleted file mode 100644
index 2c7413e35b..0000000000
--- a/package/kernel/mac80211/patches/653-0050-rtl8xxxu-Clear-SYS_FUNC_UPLL-during-power-up-on-8188.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 59a94447d4a98ab56cefe0b277251c660a333ce0 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 30 Aug 2016 14:33:18 -0400
-Subject: [PATCH] rtl8xxxu: Clear SYS_FUNC_UPLL during power up on 8188eu
-
-The vendor driver doesn't set this bit during BB config, so avoid
-setting it here too.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -561,6 +561,7 @@ static void rtl8188eu_init_phy_bb(struct
- 	val16 = rtl8xxxu_read16(priv, REG_SYS_FUNC);
- 	val16 |= (SYS_FUNC_USBA | SYS_FUNC_USBD |
- 		  SYS_FUNC_BB_GLB_RSTN | SYS_FUNC_BBRSTB);
-+	val16 &= ~SYS_FUNC_UPLL;
- 	rtl8xxxu_write16(priv, REG_SYS_FUNC, val16);
- 
- 	rtl8xxxu_init_phy_regs(priv, rtl8188eu_phy_init_table);
diff --git a/package/kernel/mac80211/patches/653-0051-rtl8xxxu-Early-enable-of-WEP-TKIP-security-on-8188eu.patch b/package/kernel/mac80211/patches/653-0051-rtl8xxxu-Early-enable-of-WEP-TKIP-security-on-8188eu.patch
deleted file mode 100644
index 56be43a599..0000000000
--- a/package/kernel/mac80211/patches/653-0051-rtl8xxxu-Early-enable-of-WEP-TKIP-security-on-8188eu.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 845f14c57fd50ec7e94f59bb1b5ad0cd1ecdbdd1 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 30 Aug 2016 15:47:05 -0400
-Subject: [PATCH] rtl8xxxu: Early enable of WEP/TKIP security on 8188eu
-
-This matches action taken in the vendor driver, however it is unclear
-why this is done.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1394,6 +1394,9 @@ static void rtl8188e_usb_quirks(struct r
- 	val32 = rtl8xxxu_read32(priv, REG_TXDMA_OFFSET_CHK);
- 	val32 |= TXDMA_OFFSET_DROP_DATA_EN;
- 	rtl8xxxu_write32(priv, REG_TXDMA_OFFSET_CHK, val32);
-+
-+	/* Pre-TX enable WEP/TKIP security */
-+	rtl8xxxu_write8(priv, REG_EARLY_MODE_CONTROL_8188E + 3, 0x01);
- }
- 
- struct rtl8xxxu_fileops rtl8188eu_fops = {
diff --git a/package/kernel/mac80211/patches/653-0052-rtl8xxxu-Correct-power-down-sequence-for-8188eu.patch b/package/kernel/mac80211/patches/653-0052-rtl8xxxu-Correct-power-down-sequence-for-8188eu.patch
deleted file mode 100644
index 603785b5d2..0000000000
--- a/package/kernel/mac80211/patches/653-0052-rtl8xxxu-Correct-power-down-sequence-for-8188eu.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 2764703c3c896d427731391aa978c536aaf4cb91 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 30 Aug 2016 17:23:35 -0400
-Subject: [PATCH] rtl8xxxu: Correct power down sequence for 8188eu
-
-This matches the vendor driver more correctly
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 26 ++++++++++++++++------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1083,7 +1083,8 @@ static void rtl8188e_disabled_to_emu(str
- 	u16 val16;
- 
- 	val16 = rtl8xxxu_read16(priv, REG_APS_FSMCO);
--	val16 &= ~(APS_FSMCO_PFM_WOWL | APS_FSMCO_ENABLE_POWERDOWN);
-+	val16 &= ~(APS_FSMCO_PFM_WOWL | APS_FSMCO_ENABLE_POWERDOWN |
-+		APS_FSMCO_HW_POWERDOWN);
- 	rtl8xxxu_write16(priv, REG_APS_FSMCO, val16);
- }
- 
-@@ -1196,15 +1197,26 @@ static int rtl8188eu_emu_to_disabled(str
- {
- 	u8 val8;
- 
--	/* 0x04[12:11] = 01 enable WL suspend */
--	val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 2);
--	val8 &= ~BIT(0);
--	rtl8xxxu_write8(priv, REG_APS_FSMCO + 2, val8);
-+	val8 = rtl8xxxu_read8(priv, REG_AFE_XTAL_CTRL + 2);
-+	val8 |= BIT(7);
-+	rtl8xxxu_write8(priv, REG_AFE_XTAL_CTRL + 2, val8);
- 
- 	val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 1);
--	val8 |= BIT(7);
-+	val8 &= ~(BIT(3) | BIT(4));
-+	val8 |= BIT(3);
- 	rtl8xxxu_write8(priv, REG_APS_FSMCO + 1, val8);
- 
-+	rtl8xxxu_write8(priv, REG_APS_FSMCO + 3, 0x00);
-+
-+	val8 = rtl8xxxu_read8(priv, REG_GPIO_MUXCFG + 1);
-+	val8 &= ~BIT(4);
-+	rtl8xxxu_write8(priv, REG_GPIO_MUXCFG + 1, val8);
-+
-+	/* Set USB suspend enable local register 0xfe10[4]=1 */
-+	val8 = rtl8xxxu_read8(priv, 0xfe10);
-+	val8 |= BIT(4);
-+	rtl8xxxu_write8(priv, 0xfe10, val8);
-+
- 	return 0;
- }
- 
-@@ -1339,7 +1351,7 @@ void rtl8188eu_power_off(struct rtl8xxxu
- 	rtl8xxxu_write8(priv, REG_GPIO_PIN_CTRL + 2, 0xff);
- 
- 	val8 = rtl8xxxu_read8(priv, REG_GPIO_IO_SEL);
--	rtl8xxxu_write8(priv, REG_GPIO_IO_SEL + 1, val8 << 4);
-+	rtl8xxxu_write8(priv, REG_GPIO_IO_SEL, val8 << 4);
- 	val8 = rtl8xxxu_read8(priv, REG_GPIO_IO_SEL + 1);
- 	rtl8xxxu_write8(priv, REG_GPIO_IO_SEL + 1, val8 | 0x0f);
- 
diff --git a/package/kernel/mac80211/patches/653-0053-rtl8xxxu-Reset-8188eu-REG_GPIO_MUXCFG-on-power-off.patch b/package/kernel/mac80211/patches/653-0053-rtl8xxxu-Reset-8188eu-REG_GPIO_MUXCFG-on-power-off.patch
deleted file mode 100644
index 9da901f93b..0000000000
--- a/package/kernel/mac80211/patches/653-0053-rtl8xxxu-Reset-8188eu-REG_GPIO_MUXCFG-on-power-off.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 89bc2e59923ffc65b4b4fc123ef152c1a9a49639 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 30 Aug 2016 17:30:14 -0400
-Subject: [PATCH] rtl8xxxu: Reset 8188eu REG_GPIO_MUXCFG on power off
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1363,6 +1363,8 @@ void rtl8188eu_power_off(struct rtl8xxxu
- 
- 	rtl8xxxu_write8(priv, REG_RSV_CTRL, 0x00);
- 
-+	rtl8xxxu_write32(priv, REG_GPIO_MUXCFG, 0x00000000);
-+
- 	val16 = rtl8xxxu_read16(priv, REG_APS_FSMCO);
- 	val16 |= APS_FSMCO_ENABLE_POWERDOWN | APS_FSMCO_HW_POWERDOWN;
- 	rtl8xxxu_write16(priv, REG_APS_FSMCO, val16);
diff --git a/package/kernel/mac80211/patches/653-0054-rtl8xxxu-Handle-devices-with-a-smaller-LLT-buffer.patch b/package/kernel/mac80211/patches/653-0054-rtl8xxxu-Handle-devices-with-a-smaller-LLT-buffer.patch
deleted file mode 100644
index 49a9f8bd8a..0000000000
--- a/package/kernel/mac80211/patches/653-0054-rtl8xxxu-Handle-devices-with-a-smaller-LLT-buffer.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 5dd3f1799baf4683c0161f7e49d65bee17f3e35d Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 31 Aug 2016 16:31:38 -0400
-Subject: [PATCH] rtl8xxxu: Handle devices with a smaller LLT buffer
-
-The 8188e (except for I cut parts) seem to have a smaller LLT buffer
-than all other known devices.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h       |  1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c |  1 +
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c  | 11 ++++++++---
- 3 files changed, 10 insertions(+), 3 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -1411,6 +1411,7 @@ struct rtl8xxxu_fileops {
- 	u8 page_num_hi;
- 	u8 page_num_lo;
- 	u8 page_num_norm;
-+	u8 last_llt_entry;
- };
- 
- extern int rtl8xxxu_debug;
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1454,4 +1454,5 @@ struct rtl8xxxu_fileops rtl8188eu_fops =
- 	.page_num_hi = TX_PAGE_NUM_HI_PQ_8188E,
- 	.page_num_lo = TX_PAGE_NUM_LO_PQ_8188E,
- 	.page_num_norm = TX_PAGE_NUM_NORM_PQ_8188E,
-+	.last_llt_entry = 176,
- };
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
-@@ -2485,11 +2485,16 @@ static int rtl8xxxu_llt_write(struct rtl
- int rtl8xxxu_init_llt_table(struct rtl8xxxu_priv *priv)
- {
- 	int ret;
--	int i;
-+	int i, last_entry;
- 	u8 last_tx_page;
- 
- 	last_tx_page = priv->fops->total_page_num;
- 
-+	if (priv->fops->last_llt_entry)
-+		last_entry = priv->fops->last_llt_entry;
-+	else
-+		last_entry = 255;
-+
- 	for (i = 0; i < last_tx_page; i++) {
- 		ret = rtl8xxxu_llt_write(priv, i, i + 1);
- 		if (ret)
-@@ -2501,14 +2506,14 @@ int rtl8xxxu_init_llt_table(struct rtl8x
- 		goto exit;
- 
- 	/* Mark remaining pages as a ring buffer */
--	for (i = last_tx_page + 1; i < 0xff; i++) {
-+	for (i = last_tx_page + 1; i < last_entry; i++) {
- 		ret = rtl8xxxu_llt_write(priv, i, (i + 1));
- 		if (ret)
- 			goto exit;
- 	}
- 
- 	/*  Let last entry point to the start entry of ring buffer */
--	ret = rtl8xxxu_llt_write(priv, 0xff, last_tx_page + 1);
-+	ret = rtl8xxxu_llt_write(priv, last_entry, last_tx_page + 1);
- 	if (ret)
- 		goto exit;
- 
diff --git a/package/kernel/mac80211/patches/653-0055-rtl8xxxu-Fix-reloading-of-driver-for-8188eu-devices.patch b/package/kernel/mac80211/patches/653-0055-rtl8xxxu-Fix-reloading-of-driver-for-8188eu-devices.patch
deleted file mode 100644
index dc0b19161e..0000000000
--- a/package/kernel/mac80211/patches/653-0055-rtl8xxxu-Fix-reloading-of-driver-for-8188eu-devices.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 7b4161933d0a409023f5ef70cdc9296ab1cf5430 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Wed, 14 Sep 2016 14:10:42 -0400
-Subject: [PATCH] rtl8xxxu: Fix reloading of driver for 8188eu devices
-
-For 8188eu, once the MAC is asked to power down by setting
-APS_FSMCO_MAC_OFF, there seems to be no way to bring it back to life.
-
-In addition, only disable RF_ENABLE in RF_CTRL rather than all bits.
-
-This was spotted by Andrea Merello who noticed that if we dropped the
-call to rtl8188eu_active_to_emu() reloading started working.
-
-Reported-by: Andrea Merello <andrea.merello@gmail.com>
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 29 +++++-----------------
- 1 file changed, 6 insertions(+), 23 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1160,37 +1160,18 @@ exit:
- static int rtl8188eu_active_to_emu(struct rtl8xxxu_priv *priv)
- {
- 	u8 val8;
--	int count, ret = 0;
- 
- 	/* Turn off RF */
--	rtl8xxxu_write8(priv, REG_RF_CTRL, 0);
-+	val8 = rtl8xxxu_read8(priv, REG_RF_CTRL);
-+	val8 &= ~RF_ENABLE;
-+	rtl8xxxu_write8(priv, REG_RF_CTRL, val8);
- 
- 	/* LDO Sleep mode */
- 	val8 = rtl8xxxu_read8(priv, REG_LPLDO_CTRL);
- 	val8 |= BIT(4);
- 	rtl8xxxu_write8(priv, REG_LPLDO_CTRL, val8);
- 
--	/* 0x0005[1] = 1 turn off MAC by HW state machine*/
--	val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 1);
--	val8 |= BIT(1);
--	rtl8xxxu_write8(priv, REG_APS_FSMCO + 1, val8);
--
--	for (count = RTL8XXXU_MAX_REG_POLL; count; count--) {
--		val8 = rtl8xxxu_read8(priv, REG_APS_FSMCO + 1);
--		if ((val8 & BIT(1)) == 0)
--			break;
--		udelay(10);
--	}
--
--	if (!count) {
--		dev_warn(&priv->udev->dev, "%s: Disabling MAC timed out\n",
--			 __func__);
--		ret = -EBUSY;
--		goto exit;
--	}
--
--exit:
--	return ret;
-+	return 0;
- }
- 
- static int rtl8188eu_emu_to_disabled(struct rtl8xxxu_priv *priv)
-@@ -1372,6 +1353,8 @@ void rtl8188eu_power_off(struct rtl8xxxu
- 
- static void rtl8188e_enable_rf(struct rtl8xxxu_priv *priv)
- {
-+	rtl8xxxu_write8(priv, REG_RF_CTRL, RF_ENABLE | RF_RSTB | RF_SDMRSTB);
-+
- 	rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00);
- }
- 
diff --git a/package/kernel/mac80211/patches/653-0056-rtl8xxxu-Make-sure-to-enable-OFDM-paths-for-8188eu-i.patch b/package/kernel/mac80211/patches/653-0056-rtl8xxxu-Make-sure-to-enable-OFDM-paths-for-8188eu-i.patch
deleted file mode 100644
index b5c98ddbde..0000000000
--- a/package/kernel/mac80211/patches/653-0056-rtl8xxxu-Make-sure-to-enable-OFDM-paths-for-8188eu-i.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From ba518f046cc1ce63b6984948b19b4d3903c5c30b Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Mon, 3 Oct 2016 11:46:37 -0400
-Subject: [PATCH] rtl8xxxu: Make sure to enable OFDM paths for 8188eu in
- rtl8188e_enable_rf()
-
-Failure to re-enable OFDM paths results in the dongle only receiving
-CCK packets which isn't overly exciting.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c
-@@ -1353,8 +1353,22 @@ void rtl8188eu_power_off(struct rtl8xxxu
- 
- static void rtl8188e_enable_rf(struct rtl8xxxu_priv *priv)
- {
-+	u32 val32;
-+
- 	rtl8xxxu_write8(priv, REG_RF_CTRL, RF_ENABLE | RF_RSTB | RF_SDMRSTB);
- 
-+	val32 = rtl8xxxu_read32(priv, REG_OFDM0_TRX_PATH_ENABLE);
-+	val32 &= ~(OFDM_RF_PATH_RX_MASK | OFDM_RF_PATH_TX_MASK);
-+	if (priv->rx_paths == 2)
-+		val32 |= OFDM_RF_PATH_RX_A | OFDM_RF_PATH_RX_B;
-+	else
-+		val32 |= OFDM_RF_PATH_RX_A;
-+	if (priv->tx_paths == 2)
-+		val32 |= OFDM_RF_PATH_TX_A | OFDM_RF_PATH_TX_B;
-+	else
-+		val32 |= OFDM_RF_PATH_TX_A;
-+	rtl8xxxu_write32(priv, REG_OFDM0_TRX_PATH_ENABLE, val32);
-+
- 	rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00);
- }
- 
diff --git a/package/kernel/mac80211/patches/653-0057-rtl8xxxu-Add-rpt_sel-entry-to-struct-rtl8xxxu_rxdesc.patch b/package/kernel/mac80211/patches/653-0057-rtl8xxxu-Add-rpt_sel-entry-to-struct-rtl8xxxu_rxdesc.patch
deleted file mode 100644
index 620783a89d..0000000000
--- a/package/kernel/mac80211/patches/653-0057-rtl8xxxu-Add-rpt_sel-entry-to-struct-rtl8xxxu_rxdesc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From f670de32e58c1623ee30d7511e62e7b7e2164684 Mon Sep 17 00:00:00 2001
-From: Jes Sorensen <Jes.Sorensen@redhat.com>
-Date: Tue, 4 Oct 2016 12:40:22 -0400
-Subject: [PATCH] rtl8xxxu: Add rpt_sel entry to struct rtl8xxxu_rxdesc16
-
-The 8188e supports TX reports which will show up as an RX packet,
-similar to how the gen2 parts handle it.
-
-Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
----
- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
-@@ -161,7 +161,8 @@ struct rtl8xxxu_rxdesc16 {
- 	u32 htc:1;
- 	u32 eosp:1;
- 	u32 bssidfit:2;
--	u32 reserved1:16;
-+	u32 rpt_sel:2;		/* 8188e */
-+	u32 reserved1:14;
- 	u32 unicastwake:1;
- 	u32 magicwake:1;
- 
-@@ -219,7 +220,8 @@ struct rtl8xxxu_rxdesc16 {
- 
- 	u32 magicwake:1;
- 	u32 unicastwake:1;
--	u32 reserved1:16;
-+	u32 reserved1:14;
-+	u32 rpt_sel:2;		/* 8188e */
- 	u32 bssidfit:2;
- 	u32 eosp:1;
- 	u32 htc:1;
author	John Crispin <john@phrozen.org>	2018-06-26 15:39:38 +0200
committer	John Crispin <john@phrozen.org>	2018-06-26 15:46:26 +0200
commit	cff16587bdcdb13bfa1fd076a77891091b08e387 (patch)
tree	e8fe1af59a7b758fc7965c21598a224f14dff432 /package
parent	3f3a2c966a39c795e59f69d386607227c260c891 (diff)
download	upstream-cff16587bdcdb13bfa1fd076a77891091b08e387.tar.gz upstream-cff16587bdcdb13bfa1fd076a77891091b08e387.tar.bz2 upstream-cff16587bdcdb13bfa1fd076a77891091b08e387.zip