diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-12 23:15:53 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-08-12 23:15:53 +0200 |
| commit | f89920c3e4be1528ceb5b645d8aaf19968275609 (patch) | |
| tree | 10382c924087f6cf212868c5c23269b477087bc3 | |
| parent | e5445288318de74e1fb63920e7ed7bf48088c3c2 (diff) | |
| download | blackbird-obmc-uboot-f89920c3e4be1528ceb5b645d8aaf19968275609.tar.gz blackbird-obmc-uboot-f89920c3e4be1528ceb5b645d8aaf19968275609.zip | |
Preserve PHY_BMCR during a soft reset.
Patch by Carl Riechers, 24 Jun 2005
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | common/miiphyutil.c | 8 |
2 files changed, 10 insertions, 1 deletions
@@ -2,6 +2,9 @@ Changes for U-Boot 1.1.3: ====================================================================== +* Preserve PHY_BMCR during a soft reset. + Patch by Carl Riechers, 24 Jun 2005 + * VoiceBlue update: eeprom tool can also store firmware version now. eeprom.bin is runable by jumping at load address. Patch by Ladislav Michl, 23 May 2005 diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 2b0dcf4f2c..13b9c65dc8 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -93,7 +93,13 @@ int miiphy_reset (unsigned char addr) unsigned short reg; int loop_cnt; - if (miiphy_write (addr, PHY_BMCR, 0x8000) != 0) { + if (miiphy_read (addr, PHY_BMCR, ®) != 0) { +#ifdef DEBUG + printf ("PHY status read failed\n"); +#endif + return (-1); + } + if (miiphy_write (addr, PHY_BMCR, reg | 0x8000) != 0) { #ifdef DEBUG puts ("PHY reset failed\n"); #endif |
