b43: LCN-PHY: implement more PHY ops before radio init

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/b43/phy_lcn.c b/drivers/net/wireless/b43/phy_lcn.c
index cf75d3d..9707a2b 100644 (file)
--- a/drivers/net/wireless/b43/phy_lcn.c
+++ b/drivers/net/wireless/b43/phy_lcn.c
@@ -48,7 +48,7 @@ static void b43_radio_2064_init(struct b43_wldev *dev)
        b43_phy_write(dev, 0x4ea, 0x4688);
        b43_phy_maskset(dev, 0x4eb, ~0x7, 0x2);
        b43_phy_mask(dev, 0x4eb, ~0x01c0);
-       b43_phy_maskset(dev, 0x4eb, 0xff00, 0x19);
+       b43_phy_maskset(dev, 0x46a, 0xff00, 0x19);
 
        b43_lcntab_write(dev, B43_LCNTAB16(0x00, 0x55), 0);
 
@@ -120,6 +120,57 @@ static void b43_phy_lcn_clear_0x07_table(struct b43_wldev *dev)
        }
 }
 
+static void b43_phy_lcn_pre_radio_init(struct b43_wldev *dev)
+{
+       b43_radio_write(dev, 0x11c, 0);
+
+       b43_phy_write(dev, 0x43b, 0);
+       b43_phy_write(dev, 0x43c, 0);
+       b43_phy_write(dev, 0x44c, 0);
+       b43_phy_write(dev, 0x4e6, 0);
+       b43_phy_write(dev, 0x4f9, 0);
+       b43_phy_write(dev, 0x4b0, 0);
+       b43_phy_write(dev, 0x938, 0);
+       b43_phy_write(dev, 0x4b0, 0);
+       b43_phy_write(dev, 0x44e, 0);
+
+       b43_phy_set(dev, 0x567, 0x03);
+
+       b43_phy_set(dev, 0x44a, 0x44);
+       b43_phy_write(dev, 0x44a, 0x80);
+
+       b43_phy_maskset(dev, 0x634, ~0xff, 0xc);
+       b43_phy_maskset(dev, 0x634, ~0xff, 0xa);
+
+       b43_phy_write(dev, 0x910, 0x1);
+
+       b43_phy_maskset(dev, 0x448, ~0x300, 0x100);
+       b43_phy_maskset(dev, 0x608, ~0xff, 0x17);
+       b43_phy_maskset(dev, 0x604, ~0x7ff, 0x3ea);
+
+       b43_phy_set(dev, 0x805, 0x1);
+
+       b43_phy_maskset(dev, 0x42f, ~0x7, 0x3);
+       b43_phy_maskset(dev, 0x030, ~0x7, 0x3);
+
+       b43_phy_write(dev, 0x414, 0x1e10);
+       b43_phy_write(dev, 0x415, 0x0640);
+
+       b43_phy_maskset(dev, 0x4df, (u16) ~0xff00, 0xf700);
+
+       b43_phy_set(dev, 0x44a, 0x44);
+       b43_phy_write(dev, 0x44a, 0x80);
+
+       b43_phy_maskset(dev, 0x434, ~0xff, 0xfd);
+       b43_phy_maskset(dev, 0x420, ~0xff, 0x10);
+
+       b43_radio_set(dev, 0x09b, 0xf0);
+
+       b43_phy_write(dev, 0x7d6, 0x0902);
+
+       /* TODO: more ops */
+}
+
 /**************************************************
  * Basic PHY ops.
  **************************************************/
@@ -170,8 +221,7 @@ static int b43_phy_lcn_op_init(struct b43_wldev *dev)
        /* TODO: various tables ops here */
        b43_phy_lcn_clean_0x18_table(dev);
 
-       /* TODO: some ops here */
-
+       b43_phy_lcn_pre_radio_init(dev);
        b43_phy_lcn_clear_0x07_table(dev);
 
        if (dev->phy.radio_ver == 0x2064)