Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

maintain PLLA on XTAL and PLLB on CLKIN at all times (makes automatic clock source switching more reliable)

Browse Source
This commit is contained in:
Michael Ossmann
2014-03-14 22:27:30 -06:00
parent ca04d7c04b
commit 15bda174c7
3 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firmware/common/hackrf_core.c
View File

@ -268,7 +268,8 @@ void cpu_clock_init(void)
si5351c_power_down_all_clocks(); si5351c_power_down_all_clocks();
si5351c_set_crystal_configuration(); si5351c_set_crystal_configuration();
si5351c_enable_xo_and_ms_fanout(); si5351c_enable_xo_and_ms_fanout();
si5351c_set_clock_source(PLL_SOURCE_XTAL); si5351c_configure_pll_sources();
si5351c_configure_pll_multisynth();
#ifdef JELLYBEAN #ifdef JELLYBEAN
/* /*
@ -324,7 +325,7 @@ void cpu_clock_init(void)
/* Set to 10 MHz, the common rate between Jellybean and Jawbreaker. */ /* Set to 10 MHz, the common rate between Jellybean and Jawbreaker. */
sample_rate_set(10000000); sample_rate_set(10000000);
si5351c_configure_clock_control(); si5351c_set_clock_source(PLL_SOURCE_XTAL);
// soft reset // soft reset
uint8_t resetdata[] = { 177, 0xac }; uint8_t resetdata[] = { 177, 0xac };
si5351c_write(resetdata, sizeof(resetdata)); si5351c_write(resetdata, sizeof(resetdata));

65
firmware/common/si5351c.c
View File

@ -126,34 +126,34 @@ void si5351c_enable_xo_and_ms_fanout()
/* /*
* Register 15: PLL Input Source * Register 15: PLL Input Source
* CLKIN_DIV=0 (Divide by 1) * CLKIN_DIV=0 (Divide by 1)
* PLLB_SRC=0 (XTAL input) * PLLA_SRC=0 (XTAL)
* PLLA_SRC=0 (XTAL input) * PLLB_SRC=1 (CLKIN)
*/ */
void si5351c_configure_pll_sources(const enum pll_sources source) void si5351c_configure_pll_sources(void)
{ {
uint8_t data[] = { 15, 0x00 }; uint8_t data[] = { 15, 0x08 };
if (source == PLL_SOURCE_CLKIN) {
data[1] = 0x0C;
}
si5351c_write(data, sizeof(data)); si5351c_write(data, sizeof(data));
} }
/* MultiSynth NA (PLL1) */ /* MultiSynth NA (PLLA) and NB (PLLB) */
void si5351c_configure_pll1_multisynth(const enum pll_sources source) void si5351c_configure_pll_multisynth(void)
{ {
//init plla to (0x0e00+512)/128*25mhz xtal = 800mhz -> int mode //init plla to (0x0e00+512)/128*25mhz xtal = 800mhz -> int mode
uint8_t data[] = { 26, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00 }; uint8_t data[] = { 26, 0x00, 0x01, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x00 };
if (source == PLL_SOURCE_CLKIN) {
/* 10 MHz input on CLKIN instead of 25 MHz XTAL */
data[4] = 0x26;
}
si5351c_write(data, sizeof(data)); si5351c_write(data, sizeof(data));
//~ data[0] =34;// pllb
//~ si5351c_write(data, sizeof(data)); /* 10 MHz input on CLKIN for PLLB */
data[0] = 34;
data[4] = 0x26;
si5351c_write(data, sizeof(data));
}
void si5351c_reset_pll(void)
{
/* reset PLLA and PLLB */
uint8_t data[] = { 177, 0xA0 };
si5351c_write(data, sizeof(data));
} }
void si5351c_configure_multisynth(const uint_fast8_t ms_number, void si5351c_configure_multisynth(const uint_fast8_t ms_number,
@ -240,17 +240,26 @@ void si5351c_configure_clock_control()
#endif #endif
#if (defined JAWBREAKER || defined HACKRF_ONE) #if (defined JAWBREAKER || defined HACKRF_ONE)
void si5351c_configure_clock_control() void si5351c_configure_clock_control(const enum pll_sources source)
{ {
uint8_t pll;
if (source == PLL_SOURCE_CLKIN) {
/* PLLB on CLKIN */
pll = SI5351C_CLK_PLL_SRC_B;
} else {
/* PLLA on XTAL */
pll = SI5351C_CLK_PLL_SRC_A;
}
uint8_t data[] = {16 uint8_t data[] = {16
,SI5351C_CLK_FRAC_MODE | SI5351C_CLK_PLL_SRC(SI5351C_CLK_PLL_SRC_A) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_2MA) ,SI5351C_CLK_FRAC_MODE | SI5351C_CLK_PLL_SRC(pll) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_2MA)
,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(SI5351C_CLK_PLL_SRC_A) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_0_4) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_2MA) ,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(pll) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_0_4) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_2MA)
,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(SI5351C_CLK_PLL_SRC_A) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_0_4) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_2MA) ,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(pll) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_0_4) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_2MA)
,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(SI5351C_CLK_PLL_SRC_A) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_8MA) ,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(pll) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_8MA)
,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(SI5351C_CLK_PLL_SRC_A) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_6MA) ,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(pll) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_6MA)
,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(SI5351C_CLK_PLL_SRC_A) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_4MA) ,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(pll) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_4MA)
,SI5351C_CLK_POWERDOWN | SI5351C_CLK_INT_MODE /*not connected, but: plla int mode*/ ,SI5351C_CLK_POWERDOWN | SI5351C_CLK_INT_MODE /*not connected, but: plla int mode*/
,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(SI5351C_CLK_PLL_SRC_A) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_8MA) ,SI5351C_CLK_INT_MODE | SI5351C_CLK_PLL_SRC(pll) | SI5351C_CLK_SRC(SI5351C_CLK_SRC_MULTISYNTH_SELF) | SI5351C_CLK_IDRV(SI5351C_CLK_IDRV_8MA)
}; };
si5351c_write(data, sizeof(data)); si5351c_write(data, sizeof(data));
} }
@ -283,9 +292,7 @@ void si5351c_configure_clock_control()
void si5351c_set_clock_source(const enum pll_sources source) void si5351c_set_clock_source(const enum pll_sources source)
{ {
si5351c_configure_pll_sources(source); si5351c_configure_clock_control(PLL_SOURCE_XTAL);
si5351c_configure_pll1_multisynth(source);
active_clock_source = source; active_clock_source = source;
} }

7
firmware/common/si5351c.h
View File

@ -67,12 +67,13 @@ void si5351c_disable_oeb_pin_control();
void si5351c_power_down_all_clocks(); void si5351c_power_down_all_clocks();
void si5351c_set_crystal_configuration(); void si5351c_set_crystal_configuration();
void si5351c_enable_xo_and_ms_fanout(); void si5351c_enable_xo_and_ms_fanout();
void si5351c_configure_pll_sources(const enum pll_sources source); void si5351c_configure_pll_sources(void);
void si5351c_configure_pll1_multisynth(const enum pll_sources source); void si5351c_configure_pll_multisynth(void);
void si5351c_reset_pll(void);
void si5351c_configure_multisynth(const uint_fast8_t ms_number, void si5351c_configure_multisynth(const uint_fast8_t ms_number,
const uint32_t p1, const uint32_t p2, const uint32_t p3, const uint32_t p1, const uint32_t p2, const uint32_t p3,
const uint_fast8_t r_div); const uint_fast8_t r_div);
void si5351c_configure_clock_control(); void si5351c_configure_clock_control(const enum pll_sources source);
void si5351c_enable_clock_outputs(); void si5351c_enable_clock_outputs();
void si5351c_set_int_mode(const uint_fast8_t ms_number, const uint_fast8_t on); void si5351c_set_int_mode(const uint_fast8_t ms_number, const uint_fast8_t on);