From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Date: Thu, 17 Mar 2016 13:21:35 +0000 Subject: [U-Boot] [PATCH] sunxi: Fix gmac not working due to cpu_eth_init no longer being called In-Reply-To: <1458219728-13910-1-git-send-email-hdegoede@redhat.com> References: <1458219728-13910-1-git-send-email-hdegoede@redhat.com> Message-ID: <1458220895.30744.31.camel@hellion.org.uk> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, 2016-03-17 at 14:02 +0100, Hans de Goede wrote: > cpu_eth_init is no longer called for dm enabled eth drivers, this > was causing the sunxi gmac eth controller to no longer work in u- > boot. > > This commit fixes this by moving the gpio setup to gpio_init() and by > calling the clock, reset and pinmux setup function from s_init(). > > Note that the mdelay is dropped as the phy gets enabled much earlier > now, so it is no longer needed. Everything is DM_ETH based now, right? Which is why this final hunk is OK? > [...] > @@ -79,16 +79,4 @@ int sunxi_gmac_initialize(bd_t *bis) > ? for (pin = SUNXI_GPA(26); pin <= SUNXI_GPA(27); pin++) > ? sunxi_gpio_set_cfgpin(pin, SUN6I_GPA_GMAC); > ?#endif > - > -#ifdef CONFIG_DM_ETH > - return 0; > -#else > -# ifdef CONFIG_RGMII > - return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_RGMII); > -# elif defined CONFIG_GMII > - return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_GMII); > -# else > - return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_MII); > -# endif > -#endif > ?}