Skip to content

DA1469x: Clock time shifts on reboots #3321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vrahane merged 6 commits into from
Oct 29, 2024
Merged

DA1469x: Clock time shifts on reboots #3321

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f2b136
da1469x/clock: Add missing services
apc067 Oct 25, 2024
e818ba1
da1469x/clock: Eliminate magic numbers
apc067 Oct 25, 2024
b80af16
da1469x/clock: Streamline the LP clock API
apc067 Oct 25, 2024
914f3f7
da1469x/clock: Calculate the RTC dividers
apc067 Oct 25, 2024
217eeb1
da1469x/os-tick: Fix slightly incorrect time-keeping
apc067 Oct 25, 2024
f0cc564
da1469x/clock: Protect register bitfields
apc067 Oct 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
da1469x/clock: Protect register bitfields 
This commit adds masking to register bitfields, where a wrong syscfg value
may result in the inadvertent overrides of neighboring bitfields.
  • Loading branch information
@apc067
apc067 committed Oct 29, 2024
commit f0cc56485e5c07174d451ef8cd78f81027ffdfe4
8 changes: 5 additions & 3 deletions hw/mcu/dialog/da1469x/src/da1469x_clock.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@ da1469x_clock_sys_xtal32m_init(void)
*/
xtalrdy_cnt = MYNEWT_VAL(MCU_CLOCK_XTAL32M_SETTLE_TIME_US) * XTALRDY_IRQ_FREQ_MAX / 1000000;

CRG_XTAL->XTALRDY_CTRL_REG = (xtalrdy_cnt << CRG_XTAL_XTALRDY_CTRL_REG_XTALRDY_CNT_Pos) |
CRG_XTAL->XTALRDY_CTRL_REG = ((xtalrdy_cnt << CRG_XTAL_XTALRDY_CTRL_REG_XTALRDY_CNT_Pos) &
CRG_XTAL_XTALRDY_CTRL_REG_XTALRDY_CNT_Msk) |
(DA1469X_XTALRDY_CLK_SEL << CRG_XTAL_XTALRDY_CTRL_REG_XTALRDY_CLK_SEL_Pos);
}

Expand Down Expand Up @@ -294,7 +295,8 @@ da1469x_clock_calibrate(uint8_t clock_sel, uint16_t ref_cnt)
/* Select reference clock & calibrated clock */
ANAMISC_BIF->CLK_REF_SEL_REG =
(DA1469X_REF_SEL << ANAMISC_BIF_CLK_REF_SEL_REG_CAL_CLK_SEL_Pos) |
(clock_sel << ANAMISC_BIF_CLK_REF_SEL_REG_REF_CLK_SEL_Pos);
((clock_sel << ANAMISC_BIF_CLK_REF_SEL_REG_REF_CLK_SEL_Pos) &
ANAMISC_BIF_CLK_REF_SEL_REG_REF_CLK_SEL_Msk);

/* Start measurement */
ANAMISC_BIF->CLK_REF_SEL_REG |= ANAMISC_BIF_CLK_REF_SEL_REG_REF_CAL_START_Msk;
Expand Down Expand Up @@ -332,7 +334,7 @@ rc32k_trim_set(uint32_t trim)
{
CRG_TOP->CLK_RC32K_REG =
(CRG_TOP->CLK_RC32K_REG & ~CRG_TOP_CLK_RC32K_REG_RC32K_TRIM_Msk) |
(trim << CRG_TOP_CLK_RC32K_REG_RC32K_TRIM_Pos);
((trim << CRG_TOP_CLK_RC32K_REG_RC32K_TRIM_Pos) & CRG_TOP_CLK_RC32K_REG_RC32K_TRIM_Msk);
}

void
Expand Down
Loading