summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-08-02 21:52:21 +0200
committerWolfgang Denk <wd@denx.de>2011-08-02 21:52:21 +0200
commit0886eef9ba25b9e8da4bbaefc1a0b6da7a9567dc (patch)
treeccb2922edb6173f70e4702d3c5560f899f3aa471 /drivers
parent1902692aa0b2dcbb9351172be03c57d1e82447e4 (diff)
parent3ce04d9bba017012751cbecf25b923bcb02ccb54 (diff)
downloadu-boot-imx-0886eef9ba25b9e8da4bbaefc1a0b6da7a9567dc.zip
u-boot-imx-0886eef9ba25b9e8da4bbaefc1a0b6da7a9567dc.tar.gz
u-boot-imx-0886eef9ba25b9e8da4bbaefc1a0b6da7a9567dc.tar.bz2
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/4xx_enet.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
index e616aaf..07170f6 100644
--- a/drivers/net/4xx_enet.c
+++ b/drivers/net/4xx_enet.c
@@ -2035,6 +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 @@ int ppc_4xx_eth_initialize (bd_t * bis)
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;