diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-24 23:41:29 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-24 23:41:29 +0000 |
| commit | 37ba08966901f98af9e83f530292f931361fe5ec (patch) | |
| tree | a3010e3d60aa3b22a7ef61504086814b3d63c2fd /target/linux/atheros/patches-2.6.28/120-spiflash.patch | |
| parent | bfdf3aa878bce33d02fc4c3801aa78d10313fcba (diff) | |
atheros: fix a spiflash write performance regression
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15027 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-2.6.28/120-spiflash.patch')
| -rw-r--r-- | target/linux/atheros/patches-2.6.28/120-spiflash.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/atheros/patches-2.6.28/120-spiflash.patch b/target/linux/atheros/patches-2.6.28/120-spiflash.patch index e661365066..e33733ecfb 100644 --- a/target/linux/atheros/patches-2.6.28/120-spiflash.patch +++ b/target/linux/atheros/patches-2.6.28/120-spiflash.patch @@ -288,10 +288,10 @@ +} + +static void -+spiflash_wait_complete(struct spiflash_priv *priv) ++spiflash_wait_complete(struct spiflash_priv *priv, unsigned int timeout) +{ + busy_wait(priv, spiflash_sendcmd(priv, SPI_RD_STATUS, 0) & -+ SPI_STATUS_WIP, 20); ++ SPI_STATUS_WIP, timeout); + spiflash_done(priv); +} + @@ -321,7 +321,7 @@ + reg |= op->tx_cnt | SPI_CTL_START; + spiflash_write_reg(priv, SPI_FLASH_CTL, reg); + -+ spiflash_wait_complete(priv); ++ spiflash_wait_complete(priv, 20); + + instr->state = MTD_ERASE_DONE; + if (instr->callback) @@ -418,7 +418,7 @@ + reg |= (read_len + 4) | SPI_CTL_START; + spiflash_write_reg(priv, SPI_FLASH_CTL, reg); + -+ spiflash_wait_complete(priv); ++ spiflash_wait_complete(priv, 1); + + bytes_left -= read_len; + to += read_len; |