forked from M-Labs/zynq-rs
1
0
Fork 0

eth: fix initialization

This commit is contained in:
Astro 2019-06-04 23:48:09 +02:00
parent 6d15b82a3e
commit b9ca9324f0
2 changed files with 10 additions and 10 deletions

View File

@ -126,11 +126,13 @@ impl Eth {
slcr::RclkCtrl::zeroed() slcr::RclkCtrl::zeroed()
.clkact(true) .clkact(true)
); );
// 0x0050_0801: 8, 5: 100 Mb/s
slcr.gem0_clk_ctrl.write( slcr.gem0_clk_ctrl.write(
slcr::ClkCtrl::zeroed() slcr::ClkCtrl::zeroed()
.clkact(true) .clkact(true)
.srcsel(slcr::PllSource::IoPll) .srcsel(slcr::PllSource::IoPll)
.divisor(10) .divisor(8)
.divisor1(5)
); );
}); });
@ -143,7 +145,7 @@ impl Eth {
Eth { regs }.init() Eth { regs }.init()
} }
fn init(self) -> Self { fn init(mut self) -> Self {
// Clear the Network Control register. // Clear the Network Control register.
self.regs.net_ctrl.write(regs::NetCtrl::zeroed()); self.regs.net_ctrl.write(regs::NetCtrl::zeroed());
self.regs.net_ctrl.write(regs::NetCtrl::zeroed().clear_stat_regs(true)); self.regs.net_ctrl.write(regs::NetCtrl::zeroed().clear_stat_regs(true));
@ -206,6 +208,7 @@ impl Eth {
regs::TxQbar::zeroed() regs::TxQbar::zeroed()
); );
self.configure();
self self
} }
@ -233,13 +236,7 @@ impl Eth {
} }
fn wait_phy_idle(&self) { fn wait_phy_idle(&self) {
let mut timeout = 5_000_000; while !self.regs.net_status.read().phy_mgmt_idle() {}
while !self.regs.net_status.read().phy_mgmt_idle() {
timeout -= 1;
if timeout == 0 {
break
}
}
} }
} }

View File

@ -262,7 +262,10 @@ register_bit!(rclk_ctrl,
register!(clk_ctrl, ClkCtrl, RW, u32); register!(clk_ctrl, ClkCtrl, RW, u32);
register_bits!(clk_ctrl, register_bits!(clk_ctrl,
/// Divisor for source clock /// 2nd divisor for source clock
divisor1, u8, 20, 25);
register_bits!(clk_ctrl,
/// 1st divisor for source clock
divisor, u8, 8, 13); divisor, u8, 8, 13);
register_bits_typed!(clk_ctrl, register_bits_typed!(clk_ctrl,
/// Source to generate the ref clock /// Source to generate the ref clock