This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
laforge gerrit-no-reply at lists.osmocom.orglaforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25613 ) Change subject: internal ul32k instead of external 32k osc ...................................................................... internal ul32k instead of external 32k osc This should be fine, the slow clock for the uarts is not used for the modes we're interested in, and the usb clock is derived from the usb sof anyway, so it's not used as a reference there either. This will most likely drift, but so did the external one, and a free-running rtc without any external input was going to drift anyway, considering the octsim is supposed to just run without being powered down for a very long time. Change-Id: I257b8854e1860ed698c4007efeb5d16e842b519a --- M sysmoOCTSIM/atmel_start_config.atstart M sysmoOCTSIM/config/hpl_gclk_config.h M sysmoOCTSIM/config/hpl_osc32kctrl_config.h M sysmoOCTSIM/config/peripheral_clk_config.h 4 files changed, 18 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart index 92ef0bb..74d73e0 100644 --- a/sysmoOCTSIM/atmel_start_config.atstart +++ b/sysmoOCTSIM/atmel_start_config.atstart @@ -663,10 +663,10 @@ functionality: System api: HAL:HPL:GCLK configuration: - $input: 100000000 - $input_id: Digital Phase Locked Loop (DPLL1) - RESERVED_InputFreq: 100000000 - RESERVED_InputFreq_id: Digital Phase Locked Loop (DPLL1) + $input: 32768 + $input_id: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) + RESERVED_InputFreq: 32768 + RESERVED_InputFreq_id: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) _$freq_output_Generic clock generator 0: 120000000 _$freq_output_Generic clock generator 1: 48000000 _$freq_output_Generic clock generator 10: 12000000 @@ -780,7 +780,7 @@ gclk_gen_2_oscillator: Digital Phase Locked Loop (DPLL1) gclk_gen_3_div: 1 gclk_gen_3_div_sel: false - gclk_gen_3_oscillator: 32kHz External Crystal Oscillator (XOSC32K) + gclk_gen_3_oscillator: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) gclk_gen_4_div: 2 gclk_gen_4_div_sel: false gclk_gen_4_oscillator: Digital Phase Locked Loop (DPLL1) @@ -838,23 +838,23 @@ api: HAL:HPL:OSC32KCTRL configuration: $input: 32768 - $input_id: 32kHz External Crystal Oscillator (XOSC32K) + $input_id: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) RESERVED_InputFreq: 32768 - RESERVED_InputFreq_id: 32kHz External Crystal Oscillator (XOSC32K) - _$freq_output_RTC source: 32768 + RESERVED_InputFreq_id: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) + _$freq_output_RTC source: 1024 enable_osculp32k: true enable_rtc_source: false - enable_xosc32k: true + enable_xosc32k: false osculp32k_calib: 0 osculp32k_calib_enable: false - rtc_1khz_selection: false - rtc_source_oscillator: 32kHz External Crystal Oscillator (XOSC32K) + rtc_1khz_selection: true + rtc_source_oscillator: 32kHz Ultra Low Power Internal Oscillator (OSCULP32K) xosc32k_arch_cfden: false xosc32k_arch_cfdeo: false xosc32k_arch_cgm: Standard mode xosc32k_arch_en1k: true xosc32k_arch_en32k: true - xosc32k_arch_enable: true + xosc32k_arch_enable: false xosc32k_arch_ondemand: false xosc32k_arch_runstdby: true xosc32k_arch_startup: 62592us diff --git a/sysmoOCTSIM/config/hpl_gclk_config.h b/sysmoOCTSIM/config/hpl_gclk_config.h index 158fc93..f2b75bf 100644 --- a/sysmoOCTSIM/config/hpl_gclk_config.h +++ b/sysmoOCTSIM/config/hpl_gclk_config.h @@ -252,7 +252,7 @@ // <i> This defines the clock source for generic clock generator 3 // <id> gclk_gen_3_oscillator #ifndef CONF_GCLK_GEN_3_SOURCE -#define CONF_GCLK_GEN_3_SOURCE GCLK_GENCTRL_SRC_XOSC32K +#define CONF_GCLK_GEN_3_SOURCE GCLK_GENCTRL_SRC_OSCULP32K #endif // <q> Run in Standby diff --git a/sysmoOCTSIM/config/hpl_osc32kctrl_config.h b/sysmoOCTSIM/config/hpl_osc32kctrl_config.h index f41861e..7bcb41b 100644 --- a/sysmoOCTSIM/config/hpl_osc32kctrl_config.h +++ b/sysmoOCTSIM/config/hpl_osc32kctrl_config.h @@ -7,7 +7,7 @@ // <e> RTC Source configuration // <id> enable_rtc_source #ifndef CONF_RTCCTRL_CONFIG -#define CONF_RTCCTRL_CONFIG 1 +#define CONF_RTCCTRL_CONFIG 0 #endif // <h> RTC source control @@ -17,7 +17,7 @@ // <i> This defines the clock source for RTC // <id> rtc_source_oscillator #ifndef CONF_RTCCTRL_SRC -#define CONF_RTCCTRL_SRC GCLK_GENCTRL_SRC_XOSC32K +#define CONF_RTCCTRL_SRC GCLK_GENCTRL_SRC_OSCULP32K #endif // <q> Use 1 kHz output @@ -43,7 +43,7 @@ // <i> Indicates whether configuration for External 32K Osc is enabled or not // <id> enable_xosc32k #ifndef CONF_XOSC32K_CONFIG -#define CONF_XOSC32K_CONFIG 1 +#define CONF_XOSC32K_CONFIG 0 #endif // <h> 32kHz External Crystal Oscillator Control @@ -51,7 +51,7 @@ // <i> Indicates whether 32kHz External Crystal Oscillator is enabled or not // <id> xosc32k_arch_enable #ifndef CONF_XOSC32K_ENABLE -#define CONF_XOSC32K_ENABLE 1 +#define CONF_XOSC32K_ENABLE 0 #endif // <o> Start-Up Time diff --git a/sysmoOCTSIM/config/peripheral_clk_config.h b/sysmoOCTSIM/config/peripheral_clk_config.h index 205e33e..0231d7d 100644 --- a/sysmoOCTSIM/config/peripheral_clk_config.h +++ b/sysmoOCTSIM/config/peripheral_clk_config.h @@ -25,7 +25,7 @@ * \brief RTC's Clock frequency */ #ifndef CONF_GCLK_RTC_FREQUENCY -#define CONF_GCLK_RTC_FREQUENCY 32768 +#define CONF_GCLK_RTC_FREQUENCY 1024 #endif // <y> Core Clock Source -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/25613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I257b8854e1860ed698c4007efeb5d16e842b519a Gerrit-Change-Number: 25613 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen <ewild at sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge at osmocom.org> Gerrit-MessageType: merged -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20211008/9b6806ad/attachment.htm>