rpms/kernel/devel linux-2.6-bcm43xx-spec-change-backout.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18908

Modified Files:
	linux-2.6-bcm43xx-spec-change-backout.patch 
Log Message:
Make it apply again


linux-2.6-bcm43xx-spec-change-backout.patch:
 linux-2.6.20.noarch/drivers/net/wireless/bcm43xx/bcm43xx.h       |    4 
 linux-2.6.20.noarch/drivers/net/wireless/bcm43xx/bcm43xx_main.c  |   10 
 linux-2.6.20.noarch/drivers/net/wireless/bcm43xx/bcm43xx_radio.c |   13 
 linux-2.6.20.ppc/drivers/net/wireless/bcm43xx/bcm43xx_phy.c      |  190 +++++-----
 4 files changed, 120 insertions(+), 97 deletions(-)

Index: linux-2.6-bcm43xx-spec-change-backout.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-bcm43xx-spec-change-backout.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-bcm43xx-spec-change-backout.patch	24 Feb 2007 22:57:11 -0000	1.1
+++ linux-2.6-bcm43xx-spec-change-backout.patch	11 Mar 2007 15:12:40 -0000	1.2
@@ -99,8 +99,8 @@
  	phy->type = phy_type;
  	phy->rev = phy_rev;
  	if ((phy_type == BCM43xx_PHYTYPE_B) || (phy_type == BCM43xx_PHYTYPE_G)) {
---- linux-2.6.20.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c.orig	2007-02-22 14:33:51.000000000 -0500
-+++ linux-2.6.20.noarch/drivers/net/wireless/bcm43xx/bcm43xx_phy.c	2007-02-24 14:39:34.000000000 -0500
+--- linux-2.6.20.ppc/drivers/net/wireless/bcm43xx/bcm43xx_phy.c.orig	2007-03-11 15:37:51.000000000 +0100
++++ linux-2.6.20.ppc/drivers/net/wireless/bcm43xx/bcm43xx_phy.c	2007-03-11 16:04:39.000000000 +0100
 @@ -205,8 +205,8 @@ static void bcm43xx_phy_init_pctl(struct
  	    (bcm->board_type == 0x0416))
  		return;
@@ -201,7 +201,7 @@
  
  	bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
  
-@@ -843,24 +835,61 @@ static void bcm43xx_phy_initb6(struct bc
+@@ -843,17 +835,19 @@ static void bcm43xx_phy_initb6(struct bc
  	struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
  	struct bcm43xx_radioinfo *radio = bcm43xx_current_radio(bcm);
  	u16 offset, val;
@@ -228,8 +228,9 @@
  		bcm43xx_radio_write16(bcm, 0x005A, 0x0088);
  		bcm43xx_radio_write16(bcm, 0x005B, 0x0088);
  		bcm43xx_radio_write16(bcm, 0x005D, 0x0088);
- 		bcm43xx_radio_write16(bcm, 0x005E, 0x0088);
- 		bcm43xx_radio_write16(bcm, 0x007D, 0x0088);
+@@ -865,7 +859,42 @@ static void bcm43xx_phy_initb6(struct bc
+ 				    BCM43xx_UCODEFLAGS_OFFSET)
+ 				    | 0x00000200));
  	}
 -	if (radio->revision == 8) {
 +	if ((radio->manufact == 0x17F) &&
@@ -271,7 +272,7 @@
  		bcm43xx_radio_write16(bcm, 0x0051, 0x0000);
  		bcm43xx_radio_write16(bcm, 0x0052, 0x0040);
  		bcm43xx_radio_write16(bcm, 0x0053, 0x00B7);
-@@ -904,26 +933,20 @@ static void bcm43xx_phy_initb6(struct bc
+@@ -909,26 +938,20 @@ static void bcm43xx_phy_initb6(struct bc
  		                  bcm43xx_phy_read(bcm, 0x0802) | 0x0100);
  		bcm43xx_phy_write(bcm, 0x042B,
  		                  bcm43xx_phy_read(bcm, 0x042B) | 0x2000);
@@ -305,7 +306,7 @@
  		bcm43xx_radio_write16(bcm, 0x005A, 0x0070);
  		bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
  		bcm43xx_radio_write16(bcm, 0x005C, 0x00B0);
-@@ -931,41 +954,46 @@ static void bcm43xx_phy_initb6(struct bc
+@@ -936,42 +959,46 @@ static void bcm43xx_phy_initb6(struct bc
  	bcm43xx_radio_write16(bcm, 0x007A,
  	                      (bcm43xx_radio_read16(bcm, 0x007A) & 0x00F8) | 0x0007);
  
@@ -328,14 +329,15 @@
  	bcm43xx_phy_write(bcm, 0x0038, 0x0668);
  	bcm43xx_radio_set_txpower_bg(bcm, 0xFFFF, 0xFFFF, 0xFFFF);
 -	if (radio->revision <= 5)
--		bcm43xx_phy_write(bcm, 0x005D, bcm43xx_phy_read(bcm, 0x005D) | 0x0003);
+-		bcm43xx_phy_write(bcm, 0x005D, (bcm43xx_phy_read(bcm, 0x005D)
+-			          & 0xFF80) | 0x0003);
 -	if (radio->revision <= 2)
 -		bcm43xx_radio_write16(bcm, 0x005D, 0x000D);
 +	if (radio->version == 0x2050) {
 +		if (radio->revision == 3 ||
 +		    radio->revision == 4 ||
 +		    radio->revision == 5)
-+			bcm43xx_phy_write(bcm, 0x005D, bcm43xx_phy_read(bcm, 0x005D) | 0x0003);
++			bcm43xx_phy_write(bcm, 0x005D, (bcm43xx_phy_read(bcm, 0x005D) & 0xFF80) | 0x0003);
 +		else if (radio->revision <= 2)
 +			bcm43xx_radio_write16(bcm, 0x005D, 0x000D);
 +	}
@@ -356,8 +358,9 @@
  		bcm43xx_phy_write(bcm, 0x0016, 0x0410);
  		bcm43xx_phy_write(bcm, 0x0017, 0x0820);
  		bcm43xx_phy_write(bcm, 0x0062, 0x0007);
- 		(void) bcm43xx_radio_calibrationvalue(bcm);
+-		bcm43xx_radio_init2050(bcm);
 -		bcm43xx_phy_lo_g_measure(bcm);
++		(void) bcm43xx_radio_calibrationvalue(bcm);
 +		bcm43xx_phy_lo_b_measure(bcm);
  		if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {
  			bcm43xx_calc_nrssi_slope(bcm);
@@ -370,7 +373,7 @@
  }
  
  static void bcm43xx_calc_loopback_gain(struct bcm43xx_private *bcm)
-@@ -1035,7 +1063,7 @@ static void bcm43xx_calc_loopback_gain(s
+@@ -1041,7 +1068,7 @@ static void bcm43xx_calc_loopback_gain(s
  	bcm43xx_phy_write(bcm, 0x005A, 0x0780);
  	bcm43xx_phy_write(bcm, 0x0059, 0xC810);
  	bcm43xx_phy_write(bcm, 0x0058, 0x000D);
@@ -379,7 +382,7 @@
  		bcm43xx_phy_write(bcm, 0x0003, 0x0122);
  	} else {
  		bcm43xx_phy_write(bcm, 0x000A,
-@@ -1177,30 +1205,27 @@ static void bcm43xx_phy_initg(struct bcm
+@@ -1183,30 +1210,27 @@ static void bcm43xx_phy_initg(struct bcm
  	if (phy->rev >= 2) {
  		bcm43xx_phy_write(bcm, 0x0814, 0x0000);
  		bcm43xx_phy_write(bcm, 0x0815, 0x0000);
@@ -425,7 +428,7 @@
  		bcm43xx_phy_write(bcm, 0x0801, bcm43xx_phy_read(bcm, 0x0801) | 0x0080);
  		bcm43xx_phy_write(bcm, 0x043E, bcm43xx_phy_read(bcm, 0x043E) | 0x0004);
  	}
-@@ -1613,14 +1638,14 @@ void bcm43xx_phy_set_baseband_attenuatio
+@@ -1619,14 +1643,14 @@ void bcm43xx_phy_set_baseband_attenuatio
  	struct bcm43xx_phyinfo *phy = bcm43xx_current_phy(bcm);
  	u16 value;