summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2015-07-25 18:47:02 +0200
committerMarek Vasut <marex@denx.de>2015-08-08 14:14:08 +0200
commite14d3f79282ce7654d2848bb8b8f74a81702fa35 (patch)
tree80498344be2aeb5d6190ae3f05169949086a1611 /arch
parent9ec7414e29a1ae9c89bd9ab1c3dd12d0f53f6f4c (diff)
downloadblackbird-obmc-uboot-e14d3f79282ce7654d2848bb8b8f74a81702fa35.tar.gz
blackbird-obmc-uboot-e14d3f79282ce7654d2848bb8b8f74a81702fa35.zip
arm: socfpga: misc: Probe ethernet GMAC from OF
The GMAC can now be probed from OF, so enable DM ethernet and remove the old ad-hoc designware_initialize() invocation. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Dinh Nguyen <dinguyen@opensource.altera.com> Cc: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-socfpga/misc.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-socfpga/misc.c b/arch/arm/mach-socfpga/misc.c
index 27193e08f7..4205fb7b52 100644
--- a/arch/arm/mach-socfpga/misc.c
+++ b/arch/arm/mach-socfpga/misc.c
@@ -82,9 +82,7 @@ int cpu_eth_init(bd_t *bis)
/* Release the EMAC controller from reset */
socfpga_per_reset(reset, 0);
- /* initialize and register the emac */
- return designware_initialize(CONFIG_EMAC_BASE,
- CONFIG_PHY_INTERFACE_MODE);
+ return 0;
}
#endif
OpenPOWER on IntegriCloud