diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-07-29 10:12:45 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-07-29 10:12:45 -0700 |
| commit | f39c4538a3ca25c79f6b793ee0b6448051dcd751 (patch) | |
| tree | d1bb5ccad239d8618a66e5c6a0eb14079c211429 /firmware/microblaze/lib/clocks.c | |
| parent | f9cec099f9909bbdf7b9f1c20db9c81173a9b98d (diff) | |
| download | uhd-f39c4538a3ca25c79f6b793ee0b6448051dcd751.tar.gz uhd-f39c4538a3ca25c79f6b793ee0b6448051dcd751.tar.bz2 uhd-f39c4538a3ca25c79f6b793ee0b6448051dcd751.zip | |
Clock bugs, LED order.
Figured out cold-start problem with Matt's help -- the DCM wasn't being
reset. This also explains why USRP2 didn't like it when
clocks_mimo_config was omitted -- it was sneakily resetting the DCM
while enabling/disabling ref outputs.
Also re-did USRP2P LED order and genericized the LED settings so LED_D
is LED_D for both USRP2 and USRP2P.
Diffstat (limited to 'firmware/microblaze/lib/clocks.c')
| -rw-r--r-- | firmware/microblaze/lib/clocks.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/firmware/microblaze/lib/clocks.c b/firmware/microblaze/lib/clocks.c index b9bd2e107..2b352a385 100644 --- a/firmware/microblaze/lib/clocks.c +++ b/firmware/microblaze/lib/clocks.c @@ -25,7 +25,6 @@ #include "ad9510.h" #include "spi.h" #include "u2_init.h" -#include "nonstdio.h" //USRP2PLUS clocks: //Clock 0: testclk @@ -46,6 +45,7 @@ clocks_init(void) // Set up basic clocking functions in AD9510 ad9510_write_reg(0x45, 0x01); // CLK2 drives distribution + //enable the 100MHz clock output to the FPGA for 50MHz CPU clock clocks_enable_fpga_clk(true, 1); spi_wait(); @@ -58,7 +58,14 @@ clocks_init(void) // ad9510_write_reg(0x5A, 0x01); // Update Regs // Primary clock configuration - clocks_mimo_config(MC_WE_DONT_LOCK); +// clocks_mimo_config(MC_WE_DONT_LOCK); + + + //wait for the clock to stabilize + while(!clocks_lock_detect()); + + //issue a reset to the DCM so it locks up to the new freq + output_regs->clk_ctrl |= CLK_RESET; // Set up other clocks //clocks_enable_test_clk(false, 0); @@ -71,7 +78,7 @@ clocks_init(void) //clocks_enable_adc_clk(true, 1); } - +/* void clocks_mimo_config(int flags) { @@ -99,7 +106,7 @@ clocks_mimo_config(int flags) spi_wait(); // Allow for clock switchover - + // The below masks include 0x10, which issues a reset to the DCM. if (flags & _MC_WE_LOCK){ // WE LOCK if (flags & _MC_MIMO_CLK_INPUT) { // Turn on ref output and choose the MIMO connector @@ -121,16 +128,14 @@ clocks_mimo_config(int flags) // else // clocks_enable_clkexp_out(false,0); } +*/ -/* bool clocks_lock_detect() { - if(pic_regs->pending & PIC_CLKSTATUS) - return true; - return false; + return (pic_regs->pending & PIC_CLKSTATUS); } -*/ + int inline clocks_gen_div(int divisor) { |