summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrazvydas Ignotas2010-03-11 16:45:07 +0100
committerJohn W. Linville2010-03-15 20:32:04 +0100
commit1e3f7ac81ef81f25d8d8d902b73d884f97e6aa21 (patch)
tree7db0bddb99d6d8d564db611b98ad6a6fdf3d6f49
parentwl1251: fix ELP_CTRL register accesses when using SDIO (diff)
downloadkernel-qcow2-linux-1e3f7ac81ef81f25d8d8d902b73d884f97e6aa21.tar.gz
kernel-qcow2-linux-1e3f7ac81ef81f25d8d8d902b73d884f97e6aa21.tar.xz
kernel-qcow2-linux-1e3f7ac81ef81f25d8d8d902b73d884f97e6aa21.zip
wl1251: reduce eeprom read wait time
4sec wait is way too pessimistic, TI driver uses 40ms here, and testing shows that is ebough, so let's also use that. While at it, add useful sounding comment from the TI driver. Signed-off-by: Grazvydas Ignotas <notasas@gmail.com> Acked-by: Kalle Valo <kalle.valo@iki.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_boot.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_boot.c b/drivers/net/wireless/wl12xx/wl1251_boot.c
index 28a808674080..acb334184d70 100644
--- a/drivers/net/wireless/wl12xx/wl1251_boot.c
+++ b/drivers/net/wireless/wl12xx/wl1251_boot.c
@@ -496,7 +496,8 @@ int wl1251_boot(struct wl1251 *wl)
/* 2. start processing NVS file */
if (wl->use_eeprom) {
wl1251_reg_write32(wl, ACX_REG_EE_START, START_EEPROM_MGR);
- msleep(4000);
+ /* Wait for EEPROM NVS burst read to complete */
+ msleep(40);
wl1251_reg_write32(wl, ACX_EEPROMLESS_IND_REG, USE_EEPROM);
} else {
ret = wl1251_boot_upload_nvs(wl);