M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

Revert "rtiocrg.c: pipistrello also has pll_reset" 

This reverts commit bdee914828.
This commit is contained in:
Robert Jördens 2015-07-27 22:18:45 -06:00
parent bdee914828
commit f0a7078336
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soc/runtime/rtiocrg.c
View File

@ -10,7 +10,9 @@ void rtiocrg_init(void)
char b; char b;
int clk; int clk;
#ifdef CSR_RTIO_CRG_PLL_RESET_ADDR
rtio_crg_pll_reset_write(0); rtio_crg_pll_reset_write(0);
#endif
b = 'i'; b = 'i';
clk = 0; clk = 0;
fs_read("startup_clock", &b, 1, NULL); fs_read("startup_clock", &b, 1, NULL);
@ -31,7 +33,11 @@ void rtiocrg_init(void)
int rtiocrg_check(void) int rtiocrg_check(void)
{ {
#ifdef CSR_RTIO_CRG_PLL_RESET_ADDR
return rtio_crg_pll_locked_read(); return rtio_crg_pll_locked_read();
#else
return 1;
#endif
} }
int rtiocrg_switch_clock(int clk) int rtiocrg_switch_clock(int clk)
@ -40,16 +46,22 @@ int rtiocrg_switch_clock(int clk)
current_clk = rtio_crg_clock_sel_read(); current_clk = rtio_crg_clock_sel_read();
if(clk == current_clk) { if(clk == current_clk) {
#ifdef CSR_RTIO_CRG_PLL_RESET_ADDR
busywait_us(150); busywait_us(150);
if(!rtio_crg_pll_locked_read()) if(!rtio_crg_pll_locked_read())
return 0; return 0;
#endif
return 1; return 1;
} }
#ifdef CSR_RTIO_CRG_PLL_RESET_ADDR
rtio_crg_pll_reset_write(1); rtio_crg_pll_reset_write(1);
#endif
rtio_crg_clock_sel_write(clk); rtio_crg_clock_sel_write(clk);
#ifdef CSR_RTIO_CRG_PLL_RESET_ADDR
rtio_crg_pll_reset_write(0); rtio_crg_pll_reset_write(0);
busywait_us(150); busywait_us(150);
if(!rtio_crg_pll_locked_read()) if(!rtio_crg_pll_locked_read())
return 0; return 0;
#endif
return 1; return 1;
} }