1 From 0094872a5e8e4664c6ea1b2dfa487063d39ae363 Mon Sep 17 00:00:00 2001
2 From: Gabor Juhos <juhosg@openwrt.org>
3 Date: Sun, 24 Mar 2013 19:26:26 +0100
4 Subject: [PATCH] rt2x00: rt2800lib: add MAC register initialization for
7 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
9 drivers/net/wireless/rt2x00/rt2800.h | 14 ++++++++++++++
10 drivers/net/wireless/rt2x00/rt2800lib.c | 19 ++++++++++++++++---
11 2 files changed, 30 insertions(+), 3 deletions(-)
13 --- a/drivers/net/wireless/rt2x00/rt2800.h
14 +++ b/drivers/net/wireless/rt2x00/rt2800.h
15 @@ -1586,6 +1586,20 @@
16 #define TX_PWR_CFG_9_STBC7_CH2 FIELD32(0x00000f00)
21 +#define TX_TXBF_CFG_0 0x138c
22 +#define TX_TXBF_CFG_1 0x13a4
23 +#define TX_TXBF_CFG_2 0x13a8
24 +#define TX_TXBF_CFG_3 0x13ac
29 +#define TX_FBK_CFG_3S_0 0x13c4
30 +#define TX_FBK_CFG_3S_1 0x13c8
33 * RX_FILTER_CFG: RX configuration register.
35 #define RX_FILTER_CFG 0x1400
36 --- a/drivers/net/wireless/rt2x00/rt2800lib.c
37 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
38 @@ -4972,6 +4972,12 @@ static int rt2800_init_registers(struct
39 rt2800_register_write(rt2x00dev, TX_SW_CFG2,
42 + } else if (rt2x00_rt(rt2x00dev, RT3883)) {
43 + rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000402);
44 + rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);
45 + rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00040000);
46 + rt2800_register_write(rt2x00dev, TX_TXBF_CFG_0, 0x8000fc21);
47 + rt2800_register_write(rt2x00dev, TX_TXBF_CFG_3, 0x00009c40);
48 } else if (rt2x00_rt(rt2x00dev, RT5390) ||
49 rt2x00_rt(rt2x00dev, RT5392) ||
50 rt2x00_rt(rt2x00dev, RT5592)) {
51 @@ -5002,9 +5008,11 @@ static int rt2800_init_registers(struct
53 rt2800_register_read(rt2x00dev, MAX_LEN_CFG, ®);
54 rt2x00_set_field32(®, MAX_LEN_CFG_MAX_MPDU, AGGREGATION_SIZE);
55 - if (rt2x00_rt_rev_gte(rt2x00dev, RT2872, REV_RT2872E) ||
56 - rt2x00_rt(rt2x00dev, RT2883) ||
57 - rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070E))
58 + if (rt2x00_rt(rt2x00dev, RT3883))
59 + rt2x00_set_field32(®, MAX_LEN_CFG_MAX_PSDU, 3);
60 + else if (rt2x00_rt_rev_gte(rt2x00dev, RT2872, REV_RT2872E) ||
61 + rt2x00_rt(rt2x00dev, RT2883) ||
62 + rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070E))
63 rt2x00_set_field32(®, MAX_LEN_CFG_MAX_PSDU, 2);
65 rt2x00_set_field32(®, MAX_LEN_CFG_MAX_PSDU, 1);
66 @@ -5157,6 +5165,11 @@ static int rt2800_init_registers(struct
67 reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
68 rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
70 + if (rt2x00_rt(rt2x00dev, RT3883)) {
71 + rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_0, 0x12111008);
72 + rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_1, 0x16151413);
75 rt2800_register_read(rt2x00dev, TX_RTS_CFG, ®);
76 rt2x00_set_field32(®, TX_RTS_CFG_AUTO_RTS_RETRY_LIMIT, 32);
77 rt2x00_set_field32(®, TX_RTS_CFG_RTS_THRES,