From: Wolfgang Denk <wd@denx.de>
Date: Tue, 2 Aug 2011 19:52:21 +0000 (+0200)
Subject: Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
X-Git-Tag: v2011.09-rc1~94
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0886eef9ba25b9e8da4bbaefc1a0b6da7a9567dc;hp=-c;p=oweals%2Fu-boot.git

Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx

* 'master' of git://git.denx.de/u-boot-ppc4xx:
  net/4xx: Install interrupt handler after driver registration
---

0886eef9ba25b9e8da4bbaefc1a0b6da7a9567dc
diff --combined drivers/net/4xx_enet.c
index e616aaf5a2,f328574fe4..07170f6831
--- a/drivers/net/4xx_enet.c
+++ b/drivers/net/4xx_enet.c
@@@ -1704,7 -1704,7 +1704,7 @@@ int enetInt (struct eth_device *dev
  			rc = 0;
  		}
  
 -		/* handle MAL RX EOB interupt from a receive */
 +		/* handle MAL RX EOB interrupt from a receive */
  		/* check for EOB on valid channels	     */
  		if (uic_mal & UIC_MAL_RXEOB) {
  			mal_eob = mfdcr(MAL0_RXEOBISR);
@@@ -2035,6 -2035,13 +2035,13 @@@ int ppc_4xx_eth_initialize (bd_t * bis
  		dev->send = ppc_4xx_eth_send;
  		dev->recv = ppc_4xx_eth_rx;
  
+ 		eth_register(dev);
+ 
+ #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
+ 		miiphy_register(dev->name,
+ 				emac4xx_miiphy_read, emac4xx_miiphy_write);
+ #endif
+ 
  		if (0 == virgin) {
  			/* set the MAL IER ??? names may change with new spec ??? */
  #if defined(CONFIG_440SPE) || \
@@@ -2072,13 -2079,6 +2079,6 @@@
  					     dev);
  			virgin = 1;
  		}
- 
- 		eth_register (dev);
- 
- #if defined(CONFIG_MII) || defined(CONFIG_CMD_MII)
- 		miiphy_register (dev->name,
- 				 emac4xx_miiphy_read, emac4xx_miiphy_write);
- #endif
  	}			/* end for each supported device */
  
  	return 0;