Add rtl8180 wireless driver

This patch adds a mac80211 based wireless driver for the rtl8180 and
rtl8185 PCI wireless cards.  Also included are some rtl8187 changes
required due to the relationship between that driver and this one.

Michael Wu is primarily responsible for the initial driver and rtl8185
support.  Andreas Merello provided the additional rtl8180 support.

Thanks to Jukka Ruohonen for the donating a rtl8185 card! It was very
helpful for the rtl8225z2 code.

The Signed-off-by information below is collected from the individual
patches submitted to wireless-2.6 before merging this driver upstream.

Signed-off-by: Andrea Merello <andreamrl@tiscali.it>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Pavel Roskin <proski@gnu.org>
Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 23 insertions, 37 deletions

diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 09e48d3bef36..8dab25a65990 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -393,37 +393,19 @@ static int rtl8187_init_hw(struct ieee80211_hw *dev)
         rtl818x_iowrite16(priv, &priv->map->RFPinsEnable, 0x1FF7);
         msleep(100);
 
-        priv->rf_init(dev);
+        priv->rf->init(dev);
 
         rtl818x_iowrite16(priv, &priv->map->BRSR, 0x01F3);
-        reg = rtl818x_ioread16(priv, &priv->map->PGSELECT) & 0xfffe;
-        rtl818x_iowrite16(priv, &priv->map->PGSELECT, reg | 0x1);
+        reg = rtl818x_ioread8(priv, &priv->map->PGSELECT) & ~1;
+        rtl818x_iowrite8(priv, &priv->map->PGSELECT, reg | 1);
         rtl818x_iowrite16(priv, (__le16 *)0xFFFE, 0x10);
         rtl818x_iowrite8(priv, &priv->map->TALLY_SEL, 0x80);
         rtl818x_iowrite8(priv, (u8 *)0xFFFF, 0x60);
-        rtl818x_iowrite16(priv, &priv->map->PGSELECT, reg);
+        rtl818x_iowrite8(priv, &priv->map->PGSELECT, reg);
 
         return 0;
 }
 
-static void rtl8187_set_channel(struct ieee80211_hw *dev, int channel)
-{
-        u32 reg;
-        struct rtl8187_priv *priv = dev->priv;
-
-        reg = rtl818x_ioread32(priv, &priv->map->TX_CONF);
-        /* Enable TX loopback on MAC level to avoid TX during channel
-         * changes, as this has be seen to causes problems and the
-         * card will stop work until next reset
-         */
-        rtl818x_iowrite32(priv, &priv->map->TX_CONF,
-                          reg | RTL818X_TX_CONF_LOOPBACK_MAC);
-        msleep(10);
-        rtl8225_rf_set_channel(dev, channel);
-        msleep(10);
-        rtl818x_iowrite32(priv, &priv->map->TX_CONF, reg);
-}
-
 static int rtl8187_start(struct ieee80211_hw *dev)
 {
         struct rtl8187_priv *priv = dev->priv;
@@ -492,7 +474,7 @@ static void rtl8187_stop(struct ieee80211_hw *dev)
         reg &= ~RTL818X_CMD_RX_ENABLE;
         rtl818x_iowrite8(priv, &priv->map->CMD, reg);
 
-        rtl8225_rf_stop(dev);
+        priv->rf->stop(dev);
 
         rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG);
         reg = rtl818x_ioread8(priv, &priv->map->CONFIG4);
@@ -543,7 +525,19 @@ static void rtl8187_remove_interface(struct ieee80211_hw *dev,
 static int rtl8187_config(struct ieee80211_hw *dev, struct ieee80211_conf *conf)
 {
         struct rtl8187_priv *priv = dev->priv;
-        rtl8187_set_channel(dev, conf->channel);
+        u32 reg;
+
+        reg = rtl818x_ioread32(priv, &priv->map->TX_CONF);
+        /* Enable TX loopback on MAC level to avoid TX during channel
+         * changes, as this has be seen to causes problems and the
+         * card will stop work until next reset
+         */
+        rtl818x_iowrite32(priv, &priv->map->TX_CONF,
+                          reg | RTL818X_TX_CONF_LOOPBACK_MAC);
+        msleep(10);
+        priv->rf->set_chan(dev, conf);
+        msleep(10);
+        rtl818x_iowrite32(priv, &priv->map->TX_CONF, reg);
 
         rtl818x_iowrite8(priv, &priv->map->SIFS, 0x22);
 
@@ -753,23 +747,16 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         eeprom_93cx6_read(&eeprom, RTL8187_EEPROM_TXPWR_BASE,
                           &priv->txpwr_base);
 
-        reg = rtl818x_ioread16(priv, &priv->map->PGSELECT) & ~1;
-        rtl818x_iowrite16(priv, &priv->map->PGSELECT, reg | 1);
+        reg = rtl818x_ioread8(priv, &priv->map->PGSELECT) & ~1;
+        rtl818x_iowrite8(priv, &priv->map->PGSELECT, reg | 1);
         /* 0 means asic B-cut, we should use SW 3 wire
          * bit-by-bit banging for radio. 1 means we can use
          * USB specific request to write radio registers */
         priv->asic_rev = rtl818x_ioread8(priv, (u8 *)0xFFFE) & 0x3;
-        rtl818x_iowrite16(priv, &priv->map->PGSELECT, reg);
+        rtl818x_iowrite8(priv, &priv->map->PGSELECT, reg);
         rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL);
 
-        rtl8225_write(dev, 0, 0x1B7);
-
-        if (rtl8225_read(dev, 8) != 0x588 || rtl8225_read(dev, 9) != 0x700)
-                priv->rf_init = rtl8225_rf_init;
-        else
-                priv->rf_init = rtl8225z2_rf_init;
-
-        rtl8225_write(dev, 0, 0x0B7);
+        priv->rf = rtl8187_detect_rf(dev);
 
         err = ieee80211_register_hw(dev);
         if (err) {
@@ -779,8 +766,7 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
 
         printk(KERN_INFO "%s: hwaddr %s, rtl8187 V%d + %s\n",
                wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),
-               priv->asic_rev, priv->rf_init == rtl8225_rf_init ?
-               "rtl8225" : "rtl8225z2");
+               priv->asic_rev, priv->rf->name);
 
         return 0;