diff options
author | Tom Rini <trini@ti.com> | 2015-02-02 10:11:44 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2015-02-02 10:11:44 -0500 |
commit | be8ddad9c85935569a00b72f92cdc34e4386850f (patch) | |
tree | 9cfff8c5cc13f0518f3dfe3a35f558e2a5637f95 /board/sunxi/gmac.c | |
parent | 358b8bc204f365be28fed94f23e53e04183a8c7f (diff) | |
parent | 5abdb156bb5c2685744be3620c4bdb1875bd81ce (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board/sunxi/gmac.c')
-rw-r--r-- | board/sunxi/gmac.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c index 4e4615e12f..8849132627 100644 --- a/board/sunxi/gmac.c +++ b/board/sunxi/gmac.c @@ -24,20 +24,13 @@ int sunxi_gmac_initialize(bd_t *bis) #ifdef CONFIG_RGMII setbits_le32(&ccm->gmac_clk_cfg, CCM_GMAC_CTRL_TX_CLK_SRC_INT_RGMII | CCM_GMAC_CTRL_GPIT_RGMII); + setbits_le32(&ccm->gmac_clk_cfg, + CCM_GMAC_CTRL_TX_CLK_DELAY(CONFIG_GMAC_TX_DELAY)); #else setbits_le32(&ccm->gmac_clk_cfg, CCM_GMAC_CTRL_TX_CLK_SRC_MII | CCM_GMAC_CTRL_GPIT_MII); #endif - /* - * In order for the gmac nic to work reliable on the Bananapi, we - * need to set bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain" - * of the GMAC clk register to 3. - */ -#if defined CONFIG_TARGET_BANANAPI || defined CONFIG_TARGET_BANANAPRO - setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10); -#endif - #ifndef CONFIG_MACH_SUN6I /* Configure pin mux settings for GMAC */ for (pin = SUNXI_GPA(0); pin <= SUNXI_GPA(16); pin++) { |