From: Simon Glass <sjg@chromium.org>
Date: Sun, 5 Apr 2015 22:07:42 +0000 (-0600)
Subject: dm: sunxi: Support driver model for Ethernet
X-Git-Tag: v2015.07-rc1~138
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5b4c6f299c6d2176dd87d284acd3f58a955eb16a;p=oweals%2Fu-boot.git

dm: sunxi: Support driver model for Ethernet

Adjust the Ethernet initialisation code to support driver model.
It is no-longer necessary to call designware_initialize(). The device will
be probed when it is used. The PHY type and GMAC base will come from the
device tree.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c
index 63a7360b6d..d90eed48f7 100644
--- a/board/sunxi/gmac.c
+++ b/board/sunxi/gmac.c
@@ -80,11 +80,15 @@ int sunxi_gmac_initialize(bd_t *bis)
 		sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC);
 #endif
 
-#ifdef CONFIG_RGMII
+#ifdef CONFIG_DM_ETH
+	return 0;
+#else
+# ifdef CONFIG_RGMII
 	return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_RGMII);
-#elif defined CONFIG_GMII
+# elif defined CONFIG_GMII
 	return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_GMII);
-#else
+# else
 	return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_MII);
+# endif
 #endif
 }