Commit 57e5e2e6 authored by Jes Sorensen's avatar Jes Sorensen Committed by Kalle Valo

rtl8xxxu: Set correct interrupt masking registers on 8192eu

Set HIMR[01] on 8192eu instead of HISR/HIMR. It's not obvious this
really matters for USB devices, but this matches the register writes
performed by the vendor driver.
Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 8a59485c
...@@ -6883,11 +6883,6 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw) ...@@ -6883,11 +6883,6 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
rtl8xxxu_write8(priv, 0xfe42, 0x80); rtl8xxxu_write8(priv, 0xfe42, 0x80);
} }
if (priv->rtl_chip == RTL8192E) {
rtl8xxxu_write32(priv, REG_HIMR0, 0x00);
rtl8xxxu_write32(priv, REG_HIMR1, 0x00);
}
if (priv->fops->phy_init_antenna_selection) if (priv->fops->phy_init_antenna_selection)
priv->fops->phy_init_antenna_selection(priv); priv->fops->phy_init_antenna_selection(priv);
...@@ -7053,11 +7048,16 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw) ...@@ -7053,11 +7048,16 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
*/ */
rtl8xxxu_write8(priv, REG_RX_DRVINFO_SZ, 4); rtl8xxxu_write8(priv, REG_RX_DRVINFO_SZ, 4);
/* if (priv->rtl_chip == RTL8192E) {
* Enable all interrupts - not obvious USB needs to do this rtl8xxxu_write32(priv, REG_HIMR0, 0x00);
*/ rtl8xxxu_write32(priv, REG_HIMR1, 0x00);
rtl8xxxu_write32(priv, REG_HISR, 0xffffffff); } else {
rtl8xxxu_write32(priv, REG_HIMR, 0xffffffff); /*
* Enable all interrupts - not obvious USB needs to do this
*/
rtl8xxxu_write32(priv, REG_HISR, 0xffffffff);
rtl8xxxu_write32(priv, REG_HIMR, 0xffffffff);
}
rtl8xxxu_set_mac(priv); rtl8xxxu_set_mac(priv);
rtl8xxxu_set_linktype(priv, NL80211_IFTYPE_STATION); rtl8xxxu_set_linktype(priv, NL80211_IFTYPE_STATION);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment