
backport from wireless-drivers-next, replacing some existing patches in our tree (marked with '=' are those which were already present): f483039cf51a rt2x00: use simple_read_from_buffer() =5c656c71b1bf rt2800: move usb specific txdone/txstatus routines to rt2800lib =0b0d556e0ebb rt2800mmio: use txdone/txstatus routines from lib =5022efb50f62 rt2x00: do not check for txstatus timeout every time on tasklet =adf26a356f13 rt2x00: use different txstatus timeouts when flushing =0240564430c0 rt2800: flush and txstatus rework for rt2800mmio 6eba8fd22352 rt2x00: rt2400pci: mark expected switch fall-through 10bb92217747 rt2x00: rt2500pci: mark expected switch fall-through 916e6bbcfcff rt2x00: rt2800lib: mark expected switch fall-throughs 641dd8068ecb rt2x00: rt61pci: mark expected switch fall-through 750afb08ca71 cross-tree: phase out dma_zalloc_coherent() =c2e28ef7711f rt2x00: reduce tx power to nominal level on RT6352 a4296994eb80 rt2x00: Work around a firmware bug with shared keys 2587791d5758 rt2x00: no need to check return value of debugfs_create functions pending on linux-wireless: rt2x00: remove unneeded check rt2x00: remove confusing AGC register rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band rt2800: enable TX_PIN_CFG_RFRX_EN only for MT7620 rt2800: comment and simplify AGC init for RT6352 rt2x00: do not print error when queue is full rt2800: partially restore old mmio txstatus behaviour rt2800: new flush implementation for SoC devices rt2800: move txstatus pending routine rt2800mmio: fetch tx status changes rt2800mmio: use timer and work for handling tx statuses timeouts rt2x00: remove last_nostatus_check rt2x00: remove not used entry field rt2x00mmio: remove legacy comment While at it also rename some existing patches now that there are separate folders with patches for each driver to make things a bit nicer to handle. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
63 lines
2.2 KiB
Diff
63 lines
2.2 KiB
Diff
From 0094872a5e8e4664c6ea1b2dfa487063d39ae363 Mon Sep 17 00:00:00 2001
|
|
From: Gabor Juhos <juhosg@openwrt.org>
|
|
Date: Sun, 24 Mar 2013 19:26:26 +0100
|
|
Subject: [PATCH] rt2x00: rt2800lib: add MAC register initialization for
|
|
RT3883
|
|
|
|
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2800.h | 14 ++++++++++++++
|
|
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 19 ++++++++++++++++---
|
|
2 files changed, 30 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800.h
|
|
@@ -1728,6 +1728,20 @@
|
|
#define TX_PWR_CFG_9B_STBC_MCS7 FIELD32(0x000000ff)
|
|
|
|
/*
|
|
+ * TX_TXBF_CFG:
|
|
+ */
|
|
+#define TX_TXBF_CFG_0 0x138c
|
|
+#define TX_TXBF_CFG_1 0x13a4
|
|
+#define TX_TXBF_CFG_2 0x13a8
|
|
+#define TX_TXBF_CFG_3 0x13ac
|
|
+
|
|
+/*
|
|
+ * TX_FBK_CFG_3S:
|
|
+ */
|
|
+#define TX_FBK_CFG_3S_0 0x13c4
|
|
+#define TX_FBK_CFG_3S_1 0x13c8
|
|
+
|
|
+/*
|
|
* RX_FILTER_CFG: RX configuration register.
|
|
*/
|
|
#define RX_FILTER_CFG 0x1400
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -5679,6 +5679,12 @@ static int rt2800_init_registers(struct
|
|
rt2800_register_write(rt2x00dev, TX_SW_CFG2,
|
|
0x00000000);
|
|
}
|
|
+ } else if (rt2x00_rt(rt2x00dev, RT3883)) {
|
|
+ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000402);
|
|
+ rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);
|
|
+ rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00040000);
|
|
+ rt2800_register_write(rt2x00dev, TX_TXBF_CFG_0, 0x8000fc21);
|
|
+ rt2800_register_write(rt2x00dev, TX_TXBF_CFG_3, 0x00009c40);
|
|
} else if (rt2x00_rt(rt2x00dev, RT5390) ||
|
|
rt2x00_rt(rt2x00dev, RT5392) ||
|
|
rt2x00_rt(rt2x00dev, RT6352)) {
|
|
@@ -5892,6 +5898,11 @@ static int rt2800_init_registers(struct
|
|
reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
|
|
rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
|
|
|
|
+ if (rt2x00_rt(rt2x00dev, RT3883)) {
|
|
+ rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_0, 0x12111008);
|
|
+ rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_1, 0x16151413);
|
|
+ }
|
|
+
|
|
reg = rt2800_register_read(rt2x00dev, TX_RTS_CFG);
|
|
rt2x00_set_field32(®, TX_RTS_CFG_AUTO_RTS_RETRY_LIMIT, 7);
|
|
rt2x00_set_field32(®, TX_RTS_CFG_RTS_THRES,
|