Commit 17ae2acd authored by Tomislav Požega's avatar Tomislav Požega Committed by Kalle Valo

rt2x00: remove unneeded check

Remove band check from rf53xx channel config routine since all chips
using it are single band.
Signed-off-by: default avatarTomislav Požega <pozega.tomislav@gmail.com>
Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent dc76bb1e
...@@ -2966,6 +2966,7 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, ...@@ -2966,6 +2966,7 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
struct channel_info *info) struct channel_info *info)
{ {
u8 rfcsr; u8 rfcsr;
int idx = rf->channel-1;
rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1); rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3); rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
...@@ -3003,60 +3004,56 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev, ...@@ -3003,60 +3004,56 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
rt2800_freq_cal_mode1(rt2x00dev); rt2800_freq_cal_mode1(rt2x00dev);
if (rf->channel <= 14) { if (rt2x00_has_cap_bt_coexist(rt2x00dev)) {
int idx = rf->channel-1; if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
/* r55/r59 value array of channel 1~14 */
if (rt2x00_has_cap_bt_coexist(rt2x00dev)) { static const char r55_bt_rev[] = {0x83, 0x83,
if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) { 0x83, 0x73, 0x73, 0x63, 0x53, 0x53,
/* r55/r59 value array of channel 1~14 */ 0x53, 0x43, 0x43, 0x43, 0x43, 0x43};
static const char r55_bt_rev[] = {0x83, 0x83, static const char r59_bt_rev[] = {0x0e, 0x0e,
0x83, 0x73, 0x73, 0x63, 0x53, 0x53, 0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,
0x53, 0x43, 0x43, 0x43, 0x43, 0x43}; 0x07, 0x07, 0x07, 0x07, 0x07, 0x07};
static const char r59_bt_rev[] = {0x0e, 0x0e,
0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09, rt2800_rfcsr_write(rt2x00dev, 55,
0x07, 0x07, 0x07, 0x07, 0x07, 0x07}; r55_bt_rev[idx]);
rt2800_rfcsr_write(rt2x00dev, 59,
rt2800_rfcsr_write(rt2x00dev, 55, r59_bt_rev[idx]);
r55_bt_rev[idx]);
rt2800_rfcsr_write(rt2x00dev, 59,
r59_bt_rev[idx]);
} else {
static const char r59_bt[] = {0x8b, 0x8b, 0x8b,
0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
0x88, 0x88, 0x86, 0x85, 0x84};
rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]);
}
} else { } else {
if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) { static const char r59_bt[] = {0x8b, 0x8b, 0x8b,
static const char r55_nonbt_rev[] = {0x23, 0x23, 0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
0x23, 0x23, 0x13, 0x13, 0x03, 0x03, 0x88, 0x88, 0x86, 0x85, 0x84};
0x03, 0x03, 0x03, 0x03, 0x03, 0x03};
static const char r59_nonbt_rev[] = {0x07, 0x07, rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]);
0x07, 0x07, 0x07, 0x07, 0x07, 0x07, }
0x07, 0x07, 0x06, 0x05, 0x04, 0x04}; } else {
if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
rt2800_rfcsr_write(rt2x00dev, 55, static const char r55_nonbt_rev[] = {0x23, 0x23,
r55_nonbt_rev[idx]); 0x23, 0x23, 0x13, 0x13, 0x03, 0x03,
rt2800_rfcsr_write(rt2x00dev, 59, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03};
r59_nonbt_rev[idx]); static const char r59_nonbt_rev[] = {0x07, 0x07,
} else if (rt2x00_rt(rt2x00dev, RT5390) || 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
rt2x00_rt(rt2x00dev, RT5392) || 0x07, 0x07, 0x06, 0x05, 0x04, 0x04};
rt2x00_rt(rt2x00dev, RT6352)) {
static const char r59_non_bt[] = {0x8f, 0x8f, rt2800_rfcsr_write(rt2x00dev, 55,
0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d, r55_nonbt_rev[idx]);
0x8a, 0x88, 0x88, 0x87, 0x87, 0x86}; rt2800_rfcsr_write(rt2x00dev, 59,
r59_nonbt_rev[idx]);
rt2800_rfcsr_write(rt2x00dev, 59, } else if (rt2x00_rt(rt2x00dev, RT5390) ||
r59_non_bt[idx]); rt2x00_rt(rt2x00dev, RT5392) ||
} else if (rt2x00_rt(rt2x00dev, RT5350)) { rt2x00_rt(rt2x00dev, RT6352)) {
static const char r59_non_bt[] = {0x0b, 0x0b, static const char r59_non_bt[] = {0x8f, 0x8f,
0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a, 0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,
0x0a, 0x09, 0x08, 0x07, 0x07, 0x06}; 0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};
rt2800_rfcsr_write(rt2x00dev, 59, rt2800_rfcsr_write(rt2x00dev, 59,
r59_non_bt[idx]); r59_non_bt[idx]);
} } else if (rt2x00_rt(rt2x00dev, RT5350)) {
static const char r59_non_bt[] = {0x0b, 0x0b,
0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
rt2800_rfcsr_write(rt2x00dev, 59,
r59_non_bt[idx]);
} }
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment