diff options
author | Christian Lamparter <chunkeey@googlemail.com> | 2010-09-17 16:07:59 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-09-21 11:05:19 -0400 |
commit | 9dec6f9c48242eec742c9475f32eeef29448701c (patch) | |
tree | 814ec6e73726d85cb1f1c82a91e69ada7809b158 /drivers/net | |
parent | e0b1cc52e5da3e2fa79666b8df81a953c95c91e4 (diff) |
carl9170: use rx chainmask from eeprom
The eeprom provides a mask for all present rx chains.
Why not use it instead of the generic initval default?
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ath/carl9170/phy.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/carl9170/phy.c b/drivers/net/wireless/ath/carl9170/phy.c index 71dea9707e21..fe265e3e6ac4 100644 --- a/drivers/net/wireless/ath/carl9170/phy.c +++ b/drivers/net/wireless/ath/carl9170/phy.c | |||
@@ -532,8 +532,11 @@ static int carl9170_init_phy_from_eeprom(struct ar9170 *ar, | |||
532 | SET_VAL(AR9170_PHY_TPCRG1_PD_GAIN_2, val, | 532 | SET_VAL(AR9170_PHY_TPCRG1_PD_GAIN_2, val, |
533 | xpd2pd[m->xpdGain & 0xf] >> 2); | 533 | xpd2pd[m->xpdGain & 0xf] >> 2); |
534 | carl9170_regwrite(AR9170_PHY_REG_TPCRG1, val); | 534 | carl9170_regwrite(AR9170_PHY_REG_TPCRG1, val); |
535 | carl9170_regwrite_finish(); | ||
536 | 535 | ||
536 | carl9170_regwrite(AR9170_PHY_REG_RX_CHAINMASK, ar->eeprom.rx_mask); | ||
537 | carl9170_regwrite(AR9170_PHY_REG_CAL_CHAINMASK, ar->eeprom.rx_mask); | ||
538 | |||
539 | carl9170_regwrite_finish(); | ||
537 | return carl9170_regwrite_result(); | 540 | return carl9170_regwrite_result(); |
538 | } | 541 | } |
539 | 542 | ||