|
@@ -2173,7 +2173,7 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
|
|
|
rt2800_rfcsr_write(rt2x00dev, 59,
|
|
|
r59_nonbt_rev[idx]);
|
|
|
} else if (rt2x00_rt(rt2x00dev, RT5390) ||
|
|
|
- rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
+ rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
static const char r59_non_bt[] = {0x8f, 0x8f,
|
|
|
0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,
|
|
|
0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};
|
|
@@ -2264,7 +2264,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
|
|
|
|
|
|
if (rf->channel <= 14) {
|
|
|
if (!rt2x00_rt(rt2x00dev, RT5390) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
+ !rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
if (test_bit(CAPABILITY_EXTERNAL_LNA_BG,
|
|
|
&rt2x00dev->cap_flags)) {
|
|
|
rt2800_bbp_write(rt2x00dev, 82, 0x62);
|
|
@@ -3592,8 +3592,8 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
|
|
|
if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))
|
|
|
rt2800_bbp_write(rt2x00dev, 84, 0x19);
|
|
|
else if (rt2x00_rt(rt2x00dev, RT3290) ||
|
|
|
- rt2x00_rt(rt2x00dev, RT5390) ||
|
|
|
- rt2x00_rt(rt2x00dev, RT5392))
|
|
|
+ rt2x00_rt(rt2x00dev, RT5390) ||
|
|
|
+ rt2x00_rt(rt2x00dev, RT5392))
|
|
|
rt2800_bbp_write(rt2x00dev, 84, 0x9a);
|
|
|
else
|
|
|
rt2800_bbp_write(rt2x00dev, 84, 0x99);
|
|
@@ -3652,7 +3652,7 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
|
|
|
else if (rt2x00_rt(rt2x00dev, RT3352))
|
|
|
rt2800_bbp_write(rt2x00dev, 105, 0x34);
|
|
|
else if (rt2x00_rt(rt2x00dev, RT5390) ||
|
|
|
- rt2x00_rt(rt2x00dev, RT5392))
|
|
|
+ rt2x00_rt(rt2x00dev, RT5392))
|
|
|
rt2800_bbp_write(rt2x00dev, 105, 0x3c);
|
|
|
else
|
|
|
rt2800_bbp_write(rt2x00dev, 105, 0x05);
|
|
@@ -3746,7 +3746,7 @@ static int rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
|
|
|
}
|
|
|
|
|
|
if (rt2x00_rt(rt2x00dev, RT5390) ||
|
|
|
- rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
+ rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
int ant, div_mode;
|
|
|
|
|
|
rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);
|
|
@@ -4356,7 +4356,7 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
|
|
|
rt2800_bbp_read(rt2x00dev, 26, &drv_data->bbp26);
|
|
|
|
|
|
if (!rt2x00_rt(rt2x00dev, RT5390) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
+ !rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
/*
|
|
|
* Set back to initial state
|
|
|
*/
|
|
@@ -4385,7 +4385,7 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
|
|
|
rt2800_register_write(rt2x00dev, OPT_14_CSR, reg);
|
|
|
|
|
|
if (!rt2x00_rt(rt2x00dev, RT5390) &&
|
|
|
- !rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
+ !rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);
|
|
|
rt2x00_set_field8(&rfcsr, RFCSR17_TX_LO1_EN, 0);
|
|
|
if (rt2x00_rt(rt2x00dev, RT3070) ||
|
|
@@ -4457,7 +4457,7 @@ static int rt2800_init_rfcsr(struct rt2x00_dev *rt2x00dev)
|
|
|
}
|
|
|
|
|
|
if (rt2x00_rt(rt2x00dev, RT5390) ||
|
|
|
- rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
+ rt2x00_rt(rt2x00dev, RT5392)) {
|
|
|
rt2800_rfcsr_read(rt2x00dev, 38, &rfcsr);
|
|
|
rt2x00_set_field8(&rfcsr, RFCSR38_RX_LO1_EN, 0);
|
|
|
rt2800_rfcsr_write(rt2x00dev, 38, rfcsr);
|