diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-09-22 14:44:24 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-12-11 15:21:45 -0500 |
commit | e44fd1cfded0e42c681ad5419b1ceea600ead29d (patch) | |
tree | 4f6811b11a8cb4c79e40b887e083005336281186 /drivers/staging/rt2860/rt_main_dev.c | |
parent | c3126b93b512c046340dfc4ab38beabd8084169f (diff) |
Staging: rt2860: add RT3090 chipset support
Add support for RT3090 chipset
(based on 2009_0612_RT3090_Linux_STA_V2.1.0.0_DPO).
Tested with RT2860.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/rt_main_dev.c')
-rw-r--r-- | drivers/staging/rt2860/rt_main_dev.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/staging/rt2860/rt_main_dev.c b/drivers/staging/rt2860/rt_main_dev.c index 89c67fc9dc3..7ea85e6a336 100644 --- a/drivers/staging/rt2860/rt_main_dev.c +++ b/drivers/staging/rt2860/rt_main_dev.c | |||
@@ -226,9 +226,9 @@ int rt28xx_close(IN PNET_DEV dev) | |||
226 | return 0; // close ok | 226 | return 0; // close ok |
227 | 227 | ||
228 | { | 228 | { |
229 | #ifdef RTMP_PCI_SUPPORT | 229 | #ifdef RTMP_MAC_PCI |
230 | RTMPPCIeLinkCtrlValueRestore(pAd, RESTORE_CLOSE); | 230 | RTMPPCIeLinkCtrlValueRestore(pAd, RESTORE_CLOSE); |
231 | #endif // RTMP_PCI_SUPPORT // | 231 | #endif // RTMP_MAC_PCI // |
232 | 232 | ||
233 | // If dirver doesn't wake up firmware here, | 233 | // If dirver doesn't wake up firmware here, |
234 | // NICLoadFirmware will hang forever when interface is up again. | 234 | // NICLoadFirmware will hang forever when interface is up again. |
@@ -320,6 +320,10 @@ int rt28xx_close(IN PNET_DEV dev) | |||
320 | 320 | ||
321 | 321 | ||
322 | brc=RT28xxPciAsicRadioOff(pAd, RTMP_HALT, 0); | 322 | brc=RT28xxPciAsicRadioOff(pAd, RTMP_HALT, 0); |
323 | |||
324 | //In solution 3 of 3090F, the bPCIclkOff will be set to TRUE after calling RT28xxPciAsicRadioOff | ||
325 | pAd->bPCIclkOff = FALSE; | ||
326 | |||
323 | if (brc==FALSE) | 327 | if (brc==FALSE) |
324 | { | 328 | { |
325 | DBGPRINT(RT_DEBUG_ERROR,("%s call RT28xxPciAsicRadioOff fail !!\n", __func__)); | 329 | DBGPRINT(RT_DEBUG_ERROR,("%s call RT28xxPciAsicRadioOff fail !!\n", __func__)); |
@@ -400,11 +404,6 @@ int rt28xx_open(IN PNET_DEV dev) | |||
400 | return -1; | 404 | return -1; |
401 | } | 405 | } |
402 | 406 | ||
403 | #ifdef RTMP_PCI_SUPPORT | ||
404 | RTMPInitPCIeLinkCtrlValue(pAd); | ||
405 | #endif // RTMP_PCI_SUPPORT // | ||
406 | |||
407 | |||
408 | if (net_dev->priv_flags == INT_MAIN) | 407 | if (net_dev->priv_flags == INT_MAIN) |
409 | { | 408 | { |
410 | if (pAd->OpMode == OPMODE_STA) | 409 | if (pAd->OpMode == OPMODE_STA) |
@@ -449,7 +448,9 @@ int rt28xx_open(IN PNET_DEV dev) | |||
449 | // RTMP_IO_WRITE32(pAd, XIFS_TIME_CFG, reg); | 448 | // RTMP_IO_WRITE32(pAd, XIFS_TIME_CFG, reg); |
450 | 449 | ||
451 | } | 450 | } |
452 | 451 | #ifdef RTMP_MAC_PCI | |
452 | RTMPInitPCIeLinkCtrlValue(pAd); | ||
453 | #endif // RTMP_MAC_PCI // | ||
453 | 454 | ||
454 | return (retval); | 455 | return (retval); |
455 | 456 | ||