diff options
Diffstat (limited to 'drivers/net/wireless/rtl8187_dev.c')
| -rw-r--r-- | drivers/net/wireless/rtl8187_dev.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c index bdea1d8ad8ef..d3067b1216ca 100644 --- a/drivers/net/wireless/rtl8187_dev.c +++ b/drivers/net/wireless/rtl8187_dev.c | |||
| @@ -430,8 +430,10 @@ static int rtl8187_init_hw(struct ieee80211_hw *dev) | |||
| 430 | reg = rtl818x_ioread8(priv, &priv->map->CONFIG3); | 430 | reg = rtl818x_ioread8(priv, &priv->map->CONFIG3); |
| 431 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg | | 431 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg | |
| 432 | RTL818X_CONFIG3_ANAPARAM_WRITE); | 432 | RTL818X_CONFIG3_ANAPARAM_WRITE); |
| 433 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM, RTL8225_ANAPARAM_ON); | 433 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM, |
| 434 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, RTL8225_ANAPARAM2_ON); | 434 | RTL8187_RTL8225_ANAPARAM_ON); |
| 435 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, | ||
| 436 | RTL8187_RTL8225_ANAPARAM2_ON); | ||
| 435 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg & | 437 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg & |
| 436 | ~RTL818X_CONFIG3_ANAPARAM_WRITE); | 438 | ~RTL818X_CONFIG3_ANAPARAM_WRITE); |
| 437 | rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, | 439 | rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, |
| @@ -453,8 +455,10 @@ static int rtl8187_init_hw(struct ieee80211_hw *dev) | |||
| 453 | reg = rtl818x_ioread8(priv, &priv->map->CONFIG3); | 455 | reg = rtl818x_ioread8(priv, &priv->map->CONFIG3); |
| 454 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, | 456 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, |
| 455 | reg | RTL818X_CONFIG3_ANAPARAM_WRITE); | 457 | reg | RTL818X_CONFIG3_ANAPARAM_WRITE); |
| 456 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM, RTL8225_ANAPARAM_ON); | 458 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM, |
| 457 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, RTL8225_ANAPARAM2_ON); | 459 | RTL8187_RTL8225_ANAPARAM_ON); |
| 460 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, | ||
| 461 | RTL8187_RTL8225_ANAPARAM2_ON); | ||
| 458 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, | 462 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, |
| 459 | reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE); | 463 | reg & ~RTL818X_CONFIG3_ANAPARAM_WRITE); |
| 460 | rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL); | 464 | rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL); |
| @@ -566,9 +570,12 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev) | |||
| 566 | reg = rtl818x_ioread8(priv, &priv->map->CONFIG3); | 570 | reg = rtl818x_ioread8(priv, &priv->map->CONFIG3); |
| 567 | reg |= RTL818X_CONFIG3_ANAPARAM_WRITE | RTL818X_CONFIG3_GNT_SELECT; | 571 | reg |= RTL818X_CONFIG3_ANAPARAM_WRITE | RTL818X_CONFIG3_GNT_SELECT; |
| 568 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg); | 572 | rtl818x_iowrite8(priv, &priv->map->CONFIG3, reg); |
| 569 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, 0x727f3f52); | 573 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM2, |
| 570 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM, 0x45090658); | 574 | RTL8187B_RTL8225_ANAPARAM2_ON); |
| 571 | rtl818x_iowrite8(priv, &priv->map->ANAPARAM3, 0); | 575 | rtl818x_iowrite32(priv, &priv->map->ANAPARAM, |
| 576 | RTL8187B_RTL8225_ANAPARAM_ON); | ||
| 577 | rtl818x_iowrite8(priv, &priv->map->ANAPARAM3, | ||
| 578 | RTL8187B_RTL8225_ANAPARAM3_ON); | ||
| 572 | 579 | ||
| 573 | rtl818x_iowrite8(priv, (u8 *)0xFF61, 0x10); | 580 | rtl818x_iowrite8(priv, (u8 *)0xFF61, 0x10); |
| 574 | reg = rtl818x_ioread8(priv, (u8 *)0xFF62); | 581 | reg = rtl818x_ioread8(priv, (u8 *)0xFF62); |