Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
authorWolfgang Denk <wd@denx.de>
Tue, 2 Aug 2011 19:52:21 +0000 (21:52 +0200)
committerWolfgang Denk <wd@denx.de>
Tue, 2 Aug 2011 19:52:21 +0000 (21:52 +0200)
* 'master' of git://git.denx.de/u-boot-ppc4xx:
  net/4xx: Install interrupt handler after driver registration

1  2 
drivers/net/4xx_enet.c

diff --combined drivers/net/4xx_enet.c
index e616aaf5a2122243779efeda43325fc9e52a77c5,f328574fe4b3cf86dbcdc691b14e83397437e9b2..07170f6831e32621d7b02f1c325bf02b4cba2e19
@@@ -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) || \
                                             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;