78 lines
2.9 KiB
Diff
78 lines
2.9 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
|
|
@@ -1588,6 +1588,20 @@
|
|
#define TX_PWR_CFG_9_STBC7_CH2 FIELD32(0x00000f00)
|
|
|
|
/*
|
|
+ * TX_TXBF_CFG:
|
|
+ */
|
|
+#define TX_TXBF_CFG_0 0x138c
|
|
+#define TX_TXBF_CFG_1 0x13a4
|
|
+#define TX_TXBF_CFG_2 0x13a8
|
|
+#define TX_TXBF_CFG_3 0x13ac
|
|
+
|
|
+/*
|
|
+ * TX_FBK_CFG_3S:
|
|
+ */
|
|
+#define TX_FBK_CFG_3S_0 0x13c4
|
|
+#define TX_FBK_CFG_3S_1 0x13c8
|
|
+
|
|
+/*
|
|
* RX_FILTER_CFG: RX configuration register.
|
|
*/
|
|
#define RX_FILTER_CFG 0x1400
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -4981,6 +4981,12 @@ static int rt2800_init_registers(struct
|
|
rt2800_register_write(rt2x00dev, TX_SW_CFG2,
|
|
0x00000000);
|
|
}
|
|
+ } else if (rt2x00_rt(rt2x00dev, RT3883)) {
|
|
+ rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000402);
|
|
+ rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);
|
|
+ rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00040000);
|
|
+ rt2800_register_write(rt2x00dev, TX_TXBF_CFG_0, 0x8000fc21);
|
|
+ rt2800_register_write(rt2x00dev, TX_TXBF_CFG_3, 0x00009c40);
|
|
} else if (rt2x00_rt(rt2x00dev, RT5390) ||
|
|
rt2x00_rt(rt2x00dev, RT5392) ||
|
|
rt2x00_rt(rt2x00dev, RT5592)) {
|
|
@@ -5011,9 +5017,11 @@ static int rt2800_init_registers(struct
|
|
|
|
rt2800_register_read(rt2x00dev, MAX_LEN_CFG, ®);
|
|
rt2x00_set_field32(®, MAX_LEN_CFG_MAX_MPDU, AGGREGATION_SIZE);
|
|
- if (rt2x00_rt_rev_gte(rt2x00dev, RT2872, REV_RT2872E) ||
|
|
- rt2x00_rt(rt2x00dev, RT2883) ||
|
|
- rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070E))
|
|
+ if (rt2x00_rt(rt2x00dev, RT3883))
|
|
+ rt2x00_set_field32(®, MAX_LEN_CFG_MAX_PSDU, 3);
|
|
+ else if (rt2x00_rt_rev_gte(rt2x00dev, RT2872, REV_RT2872E) ||
|
|
+ rt2x00_rt(rt2x00dev, RT2883) ||
|
|
+ rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070E))
|
|
rt2x00_set_field32(®, MAX_LEN_CFG_MAX_PSDU, 2);
|
|
else
|
|
rt2x00_set_field32(®, MAX_LEN_CFG_MAX_PSDU, 1);
|
|
@@ -5166,6 +5174,11 @@ static int rt2800_init_registers(struct
|
|
reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
|
|
rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
|
|
|
|
+ if (rt2x00_rt(rt2x00dev, RT3883)) {
|
|
+ rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_0, 0x12111008);
|
|
+ rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_1, 0x16151413);
|
|
+ }
|
|
+
|
|
rt2800_register_read(rt2x00dev, TX_RTS_CFG, ®);
|
|
rt2x00_set_field32(®, TX_RTS_CFG_AUTO_RTS_RETRY_LIMIT, 32);
|
|
rt2x00_set_field32(®, TX_RTS_CFG_RTS_THRES,
|