summaryrefslogtreecommitdiffstats
path: root/board/xilinx/zynq
diff options
context:
space:
mode:
authorDavid Andrey <david.andrey@netmodule.com>2013-04-05 17:24:24 +0200
committerMichal Simek <michal.simek@xilinx.com>2013-04-30 11:39:24 +0200
commit01fbf31042e1eba1fcca3e84f70db7de0d176fe4 (patch)
tree5cb69417f2c7f6e8fa3795df259e69d7310d3fcb /board/xilinx/zynq
parent117cd4cc103443b442afc4d48c8d3920f6c171c0 (diff)
downloadblackbird-obmc-uboot-01fbf31042e1eba1fcca3e84f70db7de0d176fe4.tar.gz
blackbird-obmc-uboot-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 'board/xilinx/zynq')
-rw-r--r--board/xilinx/zynq/board.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index 546adc8885..57d8f53740 100644
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -43,11 +43,11 @@ int board_eth_init(bd_t *bis)
#if defined(CONFIG_ZYNQ_GEM)
# if defined(CONFIG_ZYNQ_GEM0)
ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR0,
- CONFIG_ZYNQ_GEM_PHY_ADDR0);
+ CONFIG_ZYNQ_GEM_PHY_ADDR0, 0);
# endif
# if defined(CONFIG_ZYNQ_GEM1)
ret |= zynq_gem_initialize(bis, ZYNQ_GEM_BASEADDR1,
- CONFIG_ZYNQ_GEM_PHY_ADDR1);
+ CONFIG_ZYNQ_GEM_PHY_ADDR1, 0);
# endif
#endif
return ret;
OpenPOWER on IntegriCloud