aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Andrey2013-04-05 10:24:24 -0500
committerMichal Simek2013-04-30 04:39:24 -0500
commit01fbf31042e1eba1fcca3e84f70db7de0d176fe4 (patch)
tree5cb69417f2c7f6e8fa3795df259e69d7310d3fcb /include
parent117cd4cc103443b442afc4d48c8d3920f6c171c0 (diff)
downloadu-boot-01fbf31042e1eba1fcca3e84f70db7de0d176fe4.tar.gz
u-boot-01fbf31042e1eba1fcca3e84f70db7de0d176fe4.tar.xz
u-boot-01fbf31042e1eba1fcca3e84f70db7de0d176fe4.zip
net: gem: Preserve clk on emio interface
Avoid overwriting GEMx_RCLK_CTRL and GEMx_CLK_CTRL if the Ethernet interface is connect on EMIO Do not enable emio for this standard board configuration for now. Signed-off-by: David Andrey <david.andrey@netmodule.com> Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include')
-rw-r--r--include/netdev.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/netdev.h b/include/netdev.h
index 81117b19ca..516b351ebe 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -104,7 +104,7 @@ int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr,
104 int txpp, int rxpp); 104 int txpp, int rxpp);
105int xilinx_ll_temac_eth_init(bd_t *bis, unsigned long base_addr, int flags, 105int xilinx_ll_temac_eth_init(bd_t *bis, unsigned long base_addr, int flags,
106 unsigned long ctrl_addr); 106 unsigned long ctrl_addr);
107int zynq_gem_initialize(bd_t *bis, int base_addr, int phy_addr); 107int zynq_gem_initialize(bd_t *bis, int base_addr, int phy_addr, u32 emio);
108/* 108/*
109 * As long as the Xilinx xps_ll_temac ethernet driver has not its own interface 109 * As long as the Xilinx xps_ll_temac ethernet driver has not its own interface
110 * exported by a public hader file, we need a global definition at this point. 110 * exported by a public hader file, we need a global definition at this point.