diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-02-09 09:39:10 -0500 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-02-09 09:39:10 -0500 |
commit | 2a5bd596723e13b3f25b9a7f46e9541577bd42c7 (patch) | |
tree | d0c06496cb3d9b905795e48e0af4d3d54b404dc5 /drivers/mtd/chips | |
parent | c1f1625860847b57a0450a28d112423c2af675ff (diff) |
[MTD] Fix default timeouts for Intel NOR flash
In commit c172471b78255a5cf6d05383d9ebbf0c6683167a Nico switched to using
common code for polling for command completion. Unfortunately he also used
a common default timeout for both write and erase commands, despite the
fact that erases can take a _whole_ lot longer. Use a more sensible
default for erase timeout.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'drivers/mtd/chips')
-rw-r--r-- | drivers/mtd/chips/cfi_cmdset_0001.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/drivers/mtd/chips/cfi_cmdset_0001.c b/drivers/mtd/chips/cfi_cmdset_0001.c index f69184a92eb2..d40262518b25 100644 --- a/drivers/mtd/chips/cfi_cmdset_0001.c +++ b/drivers/mtd/chips/cfi_cmdset_0001.c | |||
@@ -397,9 +397,23 @@ struct mtd_info *cfi_cmdset_0001(struct map_info *map, int primary) | |||
397 | cfi_fixup(mtd, fixup_table); | 397 | cfi_fixup(mtd, fixup_table); |
398 | 398 | ||
399 | for (i=0; i< cfi->numchips; i++) { | 399 | for (i=0; i< cfi->numchips; i++) { |
400 | cfi->chips[i].word_write_time = 1<<cfi->cfiq->WordWriteTimeoutTyp; | 400 | if (cfi->cfiq->WordWriteTimeoutTyp) |
401 | cfi->chips[i].buffer_write_time = 1<<cfi->cfiq->BufWriteTimeoutTyp; | 401 | cfi->chips[i].word_write_time = |
402 | cfi->chips[i].erase_time = 1000<<cfi->cfiq->BlockEraseTimeoutTyp; | 402 | 1<<cfi->cfiq->WordWriteTimeoutTyp; |
403 | else | ||
404 | cfi->chips[i].word_write_time = 50000; | ||
405 | |||
406 | if (cfi->cfiq->BufWriteTimeoutTyp) | ||
407 | cfi->chips[i].buffer_write_time = | ||
408 | 1<<cfi->cfiq->BufWriteTimeoutTyp; | ||
409 | /* No default; if it isn't specified, we won't use it */ | ||
410 | |||
411 | if (cfi->cfiq->BlockEraseTimeoutTyp) | ||
412 | cfi->chips[i].erase_time = | ||
413 | 1000<<cfi->cfiq->BlockEraseTimeoutTyp; | ||
414 | else | ||
415 | cfi->chips[i].erase_time = 2000000; | ||
416 | |||
403 | cfi->chips[i].ref_point_counter = 0; | 417 | cfi->chips[i].ref_point_counter = 0; |
404 | init_waitqueue_head(&(cfi->chips[i].wq)); | 418 | init_waitqueue_head(&(cfi->chips[i].wq)); |
405 | } | 419 | } |