commit 8ff63c2d09a8632319b1f5e7ae31ed8085a2cded
author Wolfgang Denk <wd@pollux.denx.de> Fri Aug 12 23:15:53 2005 +0200
committer Wolfgang Denk <wd@pollux.denx.de> Fri Aug 12 23:15:53 2005 +0200
tree 10382c924087f6cf212868c5c23269b477087bc3
parent dbb564bc7c08da9554026f412e57fddead1d2f97

Preserve PHY_BMCR during a soft reset.
Patch by Carl Riechers, 24 Jun 2005

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 249905f..a6c64f6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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

common/miiphyutil.c

diff --git a/common/miiphyutil.c b/common/miiphyutil.c
index 2b0dcf4..13b9c65 100644
--- a/common/miiphyutil.c
+++ b/common/miiphyutil.c
@@ -93,7 +93,13 @@
 	unsigned short reg;
 	int loop_cnt;
 
-	if (miiphy_write (addr, PHY_BMCR, 0x8000) != 0) {
+	if (miiphy_read (addr, PHY_BMCR, &reg) != 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