3 files changed, 54 insertions, 14 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
index fa33b5edf931..e3eb95292a7f 100644
--- a/drivers/net/wireless/rt2x00/rt2800.h
+++ b/drivers/net/wireless/rt2x00/rt2800.h
@@ -52,6 +52,7 @@
  * RF3322 2.4G 2T2R(RT3352/RT3371/RT3372/RT3391/RT3392)
  * RF3053 2.4G/5G 3T3R(RT3883/RT3563/RT3573/RT3593/RT3662)
  * RF5592 2.4G/5G 2T2R
+ * RF3070 2.4G 1T1R
  * RF5360 2.4G 1T1R
  * RF5370 2.4G 1T1R
  * RF5390 2.4G 1T1R
@@ -70,6 +71,7 @@
 #define RF3322                          0x000c
 #define RF3053                          0x000d
 #define RF5592                          0x000f
+#define RF3070                          0x3070
 #define RF3290                          0x3290
 #define RF5360                          0x5360
 #define RF5370                          0x5370
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 88ce656f96cd..25aaa5e12d4e 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -3152,6 +3152,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
         case RF3322:
                 rt2800_config_channel_rf3322(rt2x00dev, conf, rf, info);
                 break;
+        case RF3070:
         case RF5360:
         case RF5370:
         case RF5372:
@@ -3166,7 +3167,8 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
                 rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);
         }
 
-        if (rt2x00_rf(rt2x00dev, RF3290) ||
+        if (rt2x00_rf(rt2x00dev, RF3070) ||
+            rt2x00_rf(rt2x00dev, RF3290) ||
             rt2x00_rf(rt2x00dev, RF3322) ||
             rt2x00_rf(rt2x00dev, RF5360) ||
             rt2x00_rf(rt2x00dev, RF5370) ||
@@ -3315,29 +3317,37 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
                 rt2800_rfcsr_write(rt2x00dev, 8, 0x80);
 
         if (rt2x00_rt(rt2x00dev, RT3593)) {
-                if (rt2x00_is_usb(rt2x00dev)) {
-                        rt2800_register_read(rt2x00dev, GPIO_CTRL, &reg);
+                rt2800_register_read(rt2x00dev, GPIO_CTRL, &reg);
 
-                        /* Band selection. GPIO #8 controls all paths */
+                /* Band selection */
+                if (rt2x00_is_usb(rt2x00dev) ||
+                    rt2x00_is_pcie(rt2x00dev)) {
+                        /* GPIO #8 controls all paths */
                         rt2x00_set_field32(&reg, GPIO_CTRL_DIR8, 0);
                         if (rf->channel <= 14)
                                 rt2x00_set_field32(&reg, GPIO_CTRL_VAL8, 1);
                         else
                                 rt2x00_set_field32(&reg, GPIO_CTRL_VAL8, 0);
+                }
 
+                /* LNA PE control. */
+                if (rt2x00_is_usb(rt2x00dev)) {
+                        /* GPIO #4 controls PE0 and PE1,
+                         * GPIO #7 controls PE2
+                         */
                         rt2x00_set_field32(&reg, GPIO_CTRL_DIR4, 0);
                         rt2x00_set_field32(&reg, GPIO_CTRL_DIR7, 0);
 
-                        /* LNA PE control.
-                        * GPIO #4 controls PE0 and PE1,
-                        * GPIO #7 controls PE2
-                        */
                         rt2x00_set_field32(&reg, GPIO_CTRL_VAL4, 1);
                         rt2x00_set_field32(&reg, GPIO_CTRL_VAL7, 1);
-
-                        rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
+                } else if (rt2x00_is_pcie(rt2x00dev)) {
+                        /* GPIO #4 controls PE0, PE1 and PE2 */
+                        rt2x00_set_field32(&reg, GPIO_CTRL_DIR4, 0);
+                        rt2x00_set_field32(&reg, GPIO_CTRL_VAL4, 1);
                 }
 
+                rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
+
                 /* AGC init */
                 if (rf->channel <= 14)
                         reg = 0x1c + 2 * rt2x00dev->lna_gain;
@@ -4264,6 +4274,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)
                 rt2800_rfcsr_write(rt2x00dev, 7, rfcsr);
                 break;
         case RF3053:
+        case RF3070:
         case RF3290:
         case RF5360:
         case RF5370:
@@ -5985,7 +5996,7 @@ static void rt2800_init_rfcsr_30xx(struct rt2x00_dev *rt2x00dev)
         rt2800_rfcsr_write(rt2x00dev, 20, 0xba);
         rt2800_rfcsr_write(rt2x00dev, 21, 0xdb);
         rt2800_rfcsr_write(rt2x00dev, 24, 0x16);
-        rt2800_rfcsr_write(rt2x00dev, 25, 0x01);
+        rt2800_rfcsr_write(rt2x00dev, 25, 0x03);
         rt2800_rfcsr_write(rt2x00dev, 29, 0x1f);
 
         if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F)) {
@@ -6653,17 +6664,20 @@ int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev)
         u16 word;
 
         /*
-         * Initialize all registers.
+         * Initialize MAC registers.
          */
         if (unlikely(rt2800_wait_wpdma_ready(rt2x00dev) ||
                      rt2800_init_registers(rt2x00dev)))
                 return -EIO;
 
+        /*
+         * Wait BBP/RF to wake up.
+         */
         if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev)))
                 return -EIO;
 
         /*
-         * Send signal to firmware during boot time.
+         * Send signal during boot time to initialize firmware.
          */
         rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
         rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
@@ -6672,9 +6686,15 @@ int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev)
         rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
         msleep(1);
 
+        /*
+         * Make sure BBP is up and running.
+         */
         if (unlikely(rt2800_wait_bbp_ready(rt2x00dev)))
                 return -EIO;
 
+        /*
+         * Initialize BBP/RF registers.
+         */
         rt2800_init_bbp(rt2x00dev);
         rt2800_init_rfcsr(rt2x00dev);
 
@@ -7021,6 +7041,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
         case RF3022:
         case RF3052:
         case RF3053:
+        case RF3070:
         case RF3290:
         case RF3320:
         case RF3322:
@@ -7543,6 +7564,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
                    rt2x00_rf(rt2x00dev, RF2020) ||
                    rt2x00_rf(rt2x00dev, RF3021) ||
                    rt2x00_rf(rt2x00dev, RF3022) ||
+                   rt2x00_rf(rt2x00dev, RF3070) ||
                    rt2x00_rf(rt2x00dev, RF3290) ||
                    rt2x00_rf(rt2x00dev, RF3320) ||
                    rt2x00_rf(rt2x00dev, RF3322) ||
@@ -7671,6 +7693,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
         case RF3320:
         case RF3052:
         case RF3053:
+        case RF3070:
         case RF3290:
         case RF5360:
         case RF5370:
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 96961b9a395c..96677ce55da4 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -1176,6 +1176,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* Linksys */
         { USB_DEVICE(0x13b1, 0x002f) },
         { USB_DEVICE(0x1737, 0x0079) },
+        /* Logitec */
+        { USB_DEVICE(0x0789, 0x0170) },
         /* Ralink */
         { USB_DEVICE(0x148f, 0x3572) },
         /* Sitecom */
@@ -1199,6 +1201,8 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x050d, 0x1103) },
         /* Cameo */
         { USB_DEVICE(0x148f, 0xf301) },
+        /* D-Link */
+        { USB_DEVICE(0x2001, 0x3c1f) },
         /* Edimax */
         { USB_DEVICE(0x7392, 0x7733) },
         /* Hawking */
@@ -1212,6 +1216,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x0789, 0x016b) },
         /* NETGEAR */
         { USB_DEVICE(0x0846, 0x9012) },
+        { USB_DEVICE(0x0846, 0x9013) },
         { USB_DEVICE(0x0846, 0x9019) },
         /* Planex */
         { USB_DEVICE(0x2019, 0xed19) },
@@ -1220,6 +1225,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         /* Sitecom */
         { USB_DEVICE(0x0df6, 0x0067) },
         { USB_DEVICE(0x0df6, 0x006a) },
+        { USB_DEVICE(0x0df6, 0x006e) },
         /* ZyXEL */
         { USB_DEVICE(0x0586, 0x3421) },
 #endif
@@ -1236,6 +1242,9 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x2001, 0x3c1c) },
         { USB_DEVICE(0x2001, 0x3c1d) },
         { USB_DEVICE(0x2001, 0x3c1e) },
+        { USB_DEVICE(0x2001, 0x3c20) },
+        { USB_DEVICE(0x2001, 0x3c22) },
+        { USB_DEVICE(0x2001, 0x3c23) },
         /* LG innotek */
         { USB_DEVICE(0x043e, 0x7a22) },
         { USB_DEVICE(0x043e, 0x7a42) },
@@ -1258,12 +1267,17 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x043e, 0x7a32) },
         /* AVM GmbH */
         { USB_DEVICE(0x057c, 0x8501) },
-        /* D-Link DWA-160-B2 */
+        /* Buffalo */
+        { USB_DEVICE(0x0411, 0x0241) },
+        /* D-Link */
         { USB_DEVICE(0x2001, 0x3c1a) },
+        { USB_DEVICE(0x2001, 0x3c21) },
         /* Proware */
         { USB_DEVICE(0x043e, 0x7a13) },
         /* Ralink */
         { USB_DEVICE(0x148f, 0x5572) },
+        /* TRENDnet */
+        { USB_DEVICE(0x20f4, 0x724a) },
 #endif
 #ifdef CONFIG_RT2800USB_UNKNOWN
         /*
@@ -1333,6 +1347,7 @@ static struct usb_device_id rt2800usb_device_table[] = {
         { USB_DEVICE(0x1d4d, 0x0010) },
         /* Planex */
         { USB_DEVICE(0x2019, 0xab24) },
+        { USB_DEVICE(0x2019, 0xab29) },
         /* Qcom */
         { USB_DEVICE(0x18e8, 0x6259) },
         /* RadioShack */