mac80211: rt2x00: replace patches with upstream version

Support for RT3883/RT3663 was merged upstream [1]. Use that patch
instead of our original series. The resulting source tree is
exactly identical, this commit is merely reorganizing the patches.

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git/commit/?id=d0e61a0f7cca51ce340a5a73595189972122ff25

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

1 files changed, 0 insertions, 235 deletions

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