diff options
| author | John W. Linville <linville@tuxdriver.com> | 2007-02-18 02:26:09 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-02-18 02:26:09 +0300 |
| commit | b312362be6d9155b66f3a26d9159e0a680fbd6c5 (patch) | |
| tree | 52ebaad6117abf806dab4e738d01b509839f7b12 /drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | |
| parent | bdcac1878c80b068d8e073c1691d4bd09ba9996d (diff) | |
| parent | bb52a653eaef4aee877b2fa36de8699926f788bd (diff) | |
| download | linux-b312362be6d9155b66f3a26d9159e0a680fbd6c5.tar.xz | |
Merge branch 'upstream' into upstream-jgarzik
Conflicts:
net/ieee80211/softmac/ieee80211softmac_module.c
net/ieee80211/softmac/ieee80211softmac_wx.c
Diffstat (limited to 'drivers/net/wireless/bcm43xx/bcm43xx_ilt.c')
| -rw-r--r-- | drivers/net/wireless/bcm43xx/bcm43xx_ilt.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c index ad8e569d1faf..f2b8dbac55a4 100644 --- a/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c +++ b/drivers/net/wireless/bcm43xx/bcm43xx_ilt.c @@ -325,6 +325,21 @@ void bcm43xx_ilt_write(struct bcm43xx_private *bcm, u16 offset, u16 val) } } +void bcm43xx_ilt_write32(struct bcm43xx_private *bcm, u16 offset, u32 val) +{ + if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) { + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_CTRL, offset); + mmiowb(); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA2, (val & 0xFFFF0000) >> 16); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_A_DATA1, val & 0x0000FFFF); + } else { + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_CTRL, offset); + mmiowb(); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA2, (val & 0xFFFF0000) >> 16); + bcm43xx_phy_write(bcm, BCM43xx_PHY_ILT_G_DATA1, val & 0x0000FFFF); + } +} + u16 bcm43xx_ilt_read(struct bcm43xx_private *bcm, u16 offset) { if (bcm43xx_current_phy(bcm)->type == BCM43xx_PHYTYPE_A) { |