rt2800: initialize BBP_R31 on proper subroutines
authorStanislaw Gruszka <stf_xl@wp.pl>
Sat, 18 May 2013 12:03:29 +0000 (14:03 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 24 May 2013 17:18:11 +0000 (13:18 -0400)
Signed-off-by: Stanislaw Gruszka <stf_xl@wp.pl>
Acked-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2800lib.c

index 687abd539dffc23b450f4f6ecfd3b5d19a84c2fd..c74105822fd418dd20587de8d20020b4b763bfa2 100644 (file)
@@ -3955,6 +3955,7 @@ static void rt2800_init_bbp_early(struct rt2x00_dev *rt2x00dev)
 
 static void rt2800_init_bbp_305x_soc(struct rt2x00_dev *rt2x00dev)
 {
+       rt2800_bbp_write(rt2x00dev, 31, 0x08);
 }
 
 static void rt2800_init_bbp_28xx(struct rt2x00_dev *rt2x00dev)
@@ -3968,12 +3969,16 @@ static void rt2800_init_bbp_30xx(struct rt2x00_dev *rt2x00dev)
 static void rt2800_init_bbp_3290(struct rt2x00_dev *rt2x00dev)
 {
        rt2800_bbp4_mac_if_ctrl(rt2x00dev);
+
+       rt2800_bbp_write(rt2x00dev, 31, 0x08);
 }
 
 static void rt2800_init_bbp_3352(struct rt2x00_dev *rt2x00dev)
 {
        rt2800_bbp_write(rt2x00dev, 3, 0x00);
        rt2800_bbp_write(rt2x00dev, 4, 0x50);
+
+       rt2800_bbp_write(rt2x00dev, 31, 0x08);
 }
 
 static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev)
@@ -3982,11 +3987,14 @@ static void rt2800_init_bbp_3390(struct rt2x00_dev *rt2x00dev)
 
 static void rt2800_init_bbp_3572(struct rt2x00_dev *rt2x00dev)
 {
+       rt2800_bbp_write(rt2x00dev, 31, 0x08);
 }
 
 static void rt2800_init_bbp_53xx(struct rt2x00_dev *rt2x00dev)
 {
        rt2800_bbp4_mac_if_ctrl(rt2x00dev);
+
+       rt2800_bbp_write(rt2x00dev, 31, 0x08);
 }
 
 static void rt2800_init_bbp_5592(struct rt2x00_dev *rt2x00dev)
@@ -4105,14 +4113,6 @@ static void rt2800_init_bbp(struct rt2x00_dev *rt2x00dev)
                return;
        }
 
-       if (rt2800_is_305x_soc(rt2x00dev) ||
-           rt2x00_rt(rt2x00dev, RT3290) ||
-           rt2x00_rt(rt2x00dev, RT3352) ||
-           rt2x00_rt(rt2x00dev, RT3572) ||
-           rt2x00_rt(rt2x00dev, RT5390) ||
-           rt2x00_rt(rt2x00dev, RT5392))
-               rt2800_bbp_write(rt2x00dev, 31, 0x08);
-
        if (rt2x00_rt(rt2x00dev, RT3352))
                rt2800_bbp_write(rt2x00dev, 47, 0x48);