Commit 67093a65 authored by Danny van Dyk's avatar Danny van Dyk Committed by John W. Linville
Browse files

[PATCH] Sync bcm43xx_phy_initb6() with specs 



Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8fa252d0

drivers/net/wireless/bcm43xx/bcm43xx_phy.c

+10 −5
Original line number Diff line number Diff line
@@ -947,7 +947,7 @@ static void bcm43xx_phy_initb6(struct bcm43xx_private *bcm) 
	bcm43xx_radio_write16(bcm, 0x0050, 0x0020);

	if ((bcm->current_core->radio->manufact == 0x17F) &&

	    (bcm->current_core->radio->version == 0x2050) &&

	    (bcm->current_core->radio->revision == 2)) {

	    (bcm->current_core->radio->revision <= 2)) {

		bcm43xx_radio_write16(bcm, 0x0050, 0x0020);

		bcm43xx_radio_write16(bcm, 0x005A, 0x0070);

		bcm43xx_radio_write16(bcm, 0x005B, 0x007B);
@@ -984,10 +984,15 @@ static void bcm43xx_phy_initb6(struct bcm43xx_private *bcm) 
		bcm43xx_write16(bcm, 0x03E4, 0x0009);

	if (phy->type == BCM43xx_PHYTYPE_B) {

		bcm43xx_write16(bcm, 0x03E6, 0x8140);

		bcm43xx_phy_write(bcm, 0x0016, 0x5410);

		bcm43xx_phy_write(bcm, 0x0017, 0xA820);

		bcm43xx_phy_write(bcm, 0x0007, 0x0062);

		TODO();//TODO: calibrate stuff.

		bcm43xx_phy_write(bcm, 0x0016, 0x0410);

		bcm43xx_phy_write(bcm, 0x0017, 0x0820);

		bcm43xx_phy_write(bcm, 0x0062, 0x0007);

		(void) bcm43xx_radio_calibrationvalue(bcm);

		bcm43xx_phy_lo_b_measure(bcm);

		if (bcm->sprom.boardflags & BCM43xx_BFL_RSSI) {

			bcm43xx_calc_nrssi_slope(bcm);

			bcm43xx_calc_nrssi_threshold(bcm);

		}

		bcm43xx_phy_init_pctl(bcm);

	} else

		bcm43xx_write16(bcm, 0x03E6, 0x0);

drivers/net/wireless/bcm43xx/bcm43xx_radio.c

+1 −1
Original line number Diff line number Diff line
@@ -1184,7 +1184,7 @@ int bcm43xx_radio_set_interference_mitigation(struct bcm43xx_private *bcm, 
	return 0;

}



static u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm)

u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm)

{

	u16 reg, index, ret;

drivers/net/wireless/bcm43xx/bcm43xx_radio.h

+1 −0
Original line number Diff line number Diff line
@@ -89,5 +89,6 @@ void bcm43xx_nrssi_hw_update(struct bcm43xx_private *bcm, u16 val); 
void bcm43xx_nrssi_mem_update(struct bcm43xx_private *bcm);



void bcm43xx_radio_set_tx_iq(struct bcm43xx_private *bcm);

u16 bcm43xx_radio_calibrationvalue(struct bcm43xx_private *bcm);



#endif /* BCM43xx_RADIO_H_ */