diff options
| author | Adrian Chadd <adrian@FreeBSD.org> | 2012-04-20 21:56:13 +0000 |
|---|---|---|
| committer | Adrian Chadd <adrian@FreeBSD.org> | 2012-04-20 21:56:13 +0000 |
| commit | c928fccc0958c4ade71bf166fb2e4bac7cc2dcae (patch) | |
| tree | 45d57052f329f280be2f0bf02cad60fd370faa9d /sys/dev/ath/ath_hal/ar9002 | |
| parent | a511762672f51645e798a87fb15545ea2d8257fb (diff) | |
Notes
Diffstat (limited to 'sys/dev/ath/ath_hal/ar9002')
| -rw-r--r-- | sys/dev/ath/ath_hal/ar9002/ar9280_attach.c | 2 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ar9002/ar9285_attach.c | 12 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c index 0b5c24bc12b6..af8eb925371e 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c @@ -169,7 +169,6 @@ ar9280Attach(uint16_t devid, HAL_SOFTC sc, ar5416InitState(AH5416(ah), devid, sc, st, sh, status); - /* * Use the "local" EEPROM data given to us by the higher layers. * This is a private copy out of system flash. The Linux ath9k @@ -180,7 +179,6 @@ ar9280Attach(uint16_t devid, HAL_SOFTC sc, AH_PRIVATE((ah))->ah_eepromRead = ath_hal_EepromDataRead; AH_PRIVATE((ah))->ah_eepromWrite = NULL; ah->ah_eepromdata = eepromdata; - } /* XXX override with 9280 specific state */ /* override 5416 methods for our needs */ diff --git a/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c index 0fbe4144b7c5..b43b48542c4c 100644 --- a/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c +++ b/sys/dev/ath/ath_hal/ar9002/ar9285_attach.c @@ -134,6 +134,18 @@ ar9285Attach(uint16_t devid, HAL_SOFTC sc, ar5416InitState(AH5416(ah), devid, sc, st, sh, status); + /* + * Use the "local" EEPROM data given to us by the higher layers. + * This is a private copy out of system flash. The Linux ath9k + * commit for the initial AR9130 support mentions MMIO flash + * access is "unreliable." -adrian + */ + if (eepromdata != AH_NULL) { + AH_PRIVATE(ah)->ah_eepromRead = ath_hal_EepromDataRead; + AH_PRIVATE(ah)->ah_eepromWrite = NULL; + ah->ah_eepromdata = eepromdata; + } + /* XXX override with 9285 specific state */ /* override 5416 methods for our needs */ AH5416(ah)->ah_initPLL = ar9280InitPLL; |