diff options
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_phy.c')
-rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_phy.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c index c47e19a9521a..b37f1e348700 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_phy.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_phy.c | |||
@@ -300,16 +300,20 @@ static void bcm43xx_phy_agcsetup(struct bcm43xx_private *bcm) | |||
300 | 300 | ||
301 | if (phy->rev > 2) { | 301 | if (phy->rev > 2) { |
302 | bcm43xx_phy_write(bcm, 0x0422, 0x287A); | 302 | bcm43xx_phy_write(bcm, 0x0422, 0x287A); |
303 | bcm43xx_phy_write(bcm, 0x0420, (bcm43xx_phy_read(bcm, 0x0420) & 0x0FFF) | 0x3000); | 303 | bcm43xx_phy_write(bcm, 0x0420, (bcm43xx_phy_read(bcm, 0x0420) |
304 | & 0x0FFF) | 0x3000); | ||
304 | } | 305 | } |
305 | 306 | ||
306 | bcm43xx_phy_write(bcm, 0x04A8, (bcm43xx_phy_read(bcm, 0x04A8) & 0x8080) | 0x7874); | 307 | bcm43xx_phy_write(bcm, 0x04A8, (bcm43xx_phy_read(bcm, 0x04A8) & 0x8080) |
308 | | 0x7874); | ||
307 | bcm43xx_phy_write(bcm, 0x048E, 0x1C00); | 309 | bcm43xx_phy_write(bcm, 0x048E, 0x1C00); |
308 | 310 | ||
309 | if (phy->rev == 1) { | 311 | if (phy->rev == 1) { |
310 | bcm43xx_phy_write(bcm, 0x04AB, (bcm43xx_phy_read(bcm, 0x04AB) & 0xF0FF) | 0x0600); | 312 | bcm43xx_phy_write(bcm, 0x04AB, (bcm43xx_phy_read(bcm, 0x04AB) |
313 | & 0xF0FF) | 0x0600); | ||
311 | bcm43xx_phy_write(bcm, 0x048B, 0x005E); | 314 | bcm43xx_phy_write(bcm, 0x048B, 0x005E); |
312 | bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C) & 0xFF00) | 0x001E); | 315 | bcm43xx_phy_write(bcm, 0x048C, (bcm43xx_phy_read(bcm, 0x048C) |
316 | & 0xFF00) | 0x001E); | ||
313 | bcm43xx_phy_write(bcm, 0x048D, 0x0002); | 317 | bcm43xx_phy_write(bcm, 0x048D, 0x0002); |
314 | } | 318 | } |
315 | 319 | ||
@@ -335,7 +339,8 @@ static void bcm43xx_phy_setupg(struct bcm43xx_private *bcm) | |||
335 | if (phy->rev == 1) { | 339 | if (phy->rev == 1) { |
336 | bcm43xx_phy_write(bcm, 0x0406, 0x4F19); | 340 | bcm43xx_phy_write(bcm, 0x0406, 0x4F19); |
337 | bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, | 341 | bcm43xx_phy_write(bcm, BCM43xx_PHY_G_CRS, |
338 | (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) & 0xFC3F) | 0x0340); | 342 | (bcm43xx_phy_read(bcm, BCM43xx_PHY_G_CRS) |
343 | & 0xFC3F) | 0x0340); | ||
339 | bcm43xx_phy_write(bcm, 0x042C, 0x005A); | 344 | bcm43xx_phy_write(bcm, 0x042C, 0x005A); |
340 | bcm43xx_phy_write(bcm, 0x0427, 0x001A); | 345 | bcm43xx_phy_write(bcm, 0x0427, 0x001A); |
341 | 346 | ||