From b9ca9324f081e5f6038bb735f8d64ae343d0a9ca Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 4 Jun 2019 23:48:09 +0200
Subject: [PATCH] eth: fix initialization

---
 src/eth/mod.rs | 15 ++++++---------
 src/slcr.rs    |  5 ++++-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/eth/mod.rs b/src/eth/mod.rs
index 1f51d71..fa87855 100644
--- a/src/eth/mod.rs
+++ b/src/eth/mod.rs
@@ -126,11 +126,13 @@ impl Eth {
                 slcr::RclkCtrl::zeroed()
                     .clkact(true)
             );
+            // 0x0050_0801: 8, 5: 100 Mb/s
             slcr.gem0_clk_ctrl.write(
                 slcr::ClkCtrl::zeroed()
                     .clkact(true)
                     .srcsel(slcr::PllSource::IoPll)
-                    .divisor(10)
+                    .divisor(8)
+                    .divisor1(5)
             );
         });
 
@@ -143,7 +145,7 @@ impl Eth {
         Eth { regs }.init()
     }
 
-    fn init(self) -> Self {
+    fn init(mut self) -> Self {
         // Clear the Network Control register.
         self.regs.net_ctrl.write(regs::NetCtrl::zeroed());
         self.regs.net_ctrl.write(regs::NetCtrl::zeroed().clear_stat_regs(true));
@@ -206,6 +208,7 @@ impl Eth {
             regs::TxQbar::zeroed()
         );
 
+        self.configure();
         self
     }
 
@@ -233,13 +236,7 @@ impl Eth {
     }
 
     fn wait_phy_idle(&self) {
-        let mut timeout = 5_000_000;
-        while !self.regs.net_status.read().phy_mgmt_idle() {
-            timeout -= 1;
-            if timeout == 0 {
-                break
-            }
-        }
+        while !self.regs.net_status.read().phy_mgmt_idle() {}
     }
 }
 
diff --git a/src/slcr.rs b/src/slcr.rs
index 22f4442..9b28bf2 100644
--- a/src/slcr.rs
+++ b/src/slcr.rs
@@ -262,7 +262,10 @@ register_bit!(rclk_ctrl,
 
 register!(clk_ctrl, ClkCtrl, RW, u32);
 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);
 register_bits_typed!(clk_ctrl,
                      /// Source to generate the ref clock