diff options
| author | wdenk <wdenk> | 2004-03-24 02:20:24 +0300 |
|---|---|---|
| committer | wdenk <wdenk> | 2004-03-24 02:20:24 +0300 |
| commit | 6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1 (patch) | |
| tree | c984d6e17157fb9400abc0c50e4e5ac19eb4316d /common/cmd_ace.c | |
| parent | eeb1b77b7d994b2fde385d5b90bb1abfc0ba3bee (diff) | |
| download | u-boot-6fb6af6dc9b2f99d2ef728eb3ba71d112479c9f1.tar.xz | |
* Patch by Stephen Williams, 19 March 2004
Increase speed of sector reads from SystemACE,
shorten poll timeout and remove a useless reset
* Patch by Tolunay Orkun, 19 Mar 2004:
Make GigE PHY 1000Mbps Speed/Duplex detection conditional
(CONFIG_PHY_GIGE)
* Patch by Brad Kemp, 18 Mar 2004:
prevent machine checks during a PCI scan
* Patch by Pierre Aubert, 18 Mar 2004:
Fix string cleaning in IDE identification
Diffstat (limited to 'common/cmd_ace.c')
| -rw-r--r-- | common/cmd_ace.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/common/cmd_ace.c b/common/cmd_ace.c index b6f8604780..3512a15189 100644 --- a/common/cmd_ace.c +++ b/common/cmd_ace.c @@ -190,16 +190,13 @@ static unsigned long systemace_read(int dev, /* Write sector count | ReadMemCardData. */ ace_writew((trans&0xff) | 0x0300, 0x14); - /* CONTROLREG = CFGRESET|LOCKREQ */ - ace_writew(0x0082, 0x18); - retry = trans * 16; while (retry > 0) { int idx; /* Wait for buffer to become ready. */ while (! (ace_readw(0x04) & 0x0020)) { - udelay(1000); + udelay(100); } /* Read 16 words of 2bytes from the sector buffer. */ |