rt2x00: Split rt61/rt73 antenna selection into RX and TX antenna

Based on investigation of the legacy drivers, I have made the
following assumptions of the antenna setup:
 - R77 is the TX antenna configuration
 - RF2529 fetches default antenna selection from NIC eeprom word

With these assumptions we can change the antenna configuration
to correctly read both antenna setup values and correctly
configure the antenna. And we can now also configure the antenna
for RF2529 without a double antenna.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 46 insertions, 12 deletions

diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index e3d5e78661e..b9d5310c386 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -408,6 +408,29 @@ static void rt73usb_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
 
         rt2x00_set_field8(&r3, BBP_R3_SMART_MODE, 0);
 
+        /*
+         * Configure the TX antenna.
+         */
+        switch (ant->tx) {
+        case ANTENNA_A:
+                rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 0);
+                break;
+        case ANTENNA_SW_DIVERSITY:
+        case ANTENNA_HW_DIVERSITY:
+                /*
+                 * NOTE: We should never come here because rt2x00lib is
+                 * supposed to catch this and send us the correct antenna
+                 * explicitely. However we are nog going to bug about this.
+                 * Instead, just default to antenna B.
+                 */
+        case ANTENNA_B:
+                rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 3);
+                break;
+        }
+
+        /*
+         * Configure the RX antenna.
+         */
         switch (ant->rx) {
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2);
@@ -417,11 +440,6 @@ static void rt73usb_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
         case ANTENNA_A:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
-
-                if (rt2x00dev->curr_hwmode == HWMODE_A)
-                        rt2x00_set_field8(&r77, BBP_R77_PAIR, 0);
-                else
-                        rt2x00_set_field8(&r77, BBP_R77_PAIR, 3);
                 break;
         case ANTENNA_SW_DIVERSITY:
                 /*
@@ -433,11 +451,6 @@ static void rt73usb_config_antenna_5x(struct rt2x00_dev *rt2x00dev,
         case ANTENNA_B:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1);
                 rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END, 0);
-
-                if (rt2x00dev->curr_hwmode == HWMODE_A)
-                        rt2x00_set_field8(&r77, BBP_R77_PAIR, 3);
-                else
-                        rt2x00_set_field8(&r77, BBP_R77_PAIR, 0);
                 break;
         }
 
@@ -461,13 +474,35 @@ static void rt73usb_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
         rt2x00_set_field8(&r4, BBP_R4_RX_FRAME_END,
                           !test_bit(CONFIG_FRAME_TYPE, &rt2x00dev->flags));
 
+        /*
+         * Configure the TX antenna.
+         */
+        switch (ant->tx) {
+        case ANTENNA_A:
+                rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 0);
+                break;
+        case ANTENNA_SW_DIVERSITY:
+        case ANTENNA_HW_DIVERSITY:
+                /*
+                 * NOTE: We should never come here because rt2x00lib is
+                 * supposed to catch this and send us the correct antenna
+                 * explicitely. However we are nog going to bug about this.
+                 * Instead, just default to antenna B.
+                 */
+        case ANTENNA_B:
+                rt2x00_set_field8(&r77, BBP_R77_TX_ANTENNA, 3);
+                break;
+        }
+
+        /*
+         * Configure the RX antenna.
+         */
         switch (ant->rx) {
         case ANTENNA_HW_DIVERSITY:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 2);
                 break;
         case ANTENNA_A:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1);
-                rt2x00_set_field8(&r77, BBP_R77_PAIR, 3);
                 break;
         case ANTENNA_SW_DIVERSITY:
                 /*
@@ -478,7 +513,6 @@ static void rt73usb_config_antenna_2x(struct rt2x00_dev *rt2x00dev,
                  */
         case ANTENNA_B:
                 rt2x00_set_field8(&r4, BBP_R4_RX_ANTENNA, 1);
-                rt2x00_set_field8(&r77, BBP_R77_PAIR, 0);
                 break;
         }